From b7e21c617453e89c13ebb24ebb00d96ebba554ce Mon Sep 17 00:00:00 2001 From: Jannik Schönartz Date: Thu, 4 Apr 2019 17:21:12 +0200 Subject: Ping requests now consideres the exitcode of the subprocess removed config file and add template. --- bwlp.config | 22 ---------------------- bwlp.config.template | 4 ++++ main.py | 12 +++++++++--- 3 files changed, 13 insertions(+), 25 deletions(-) delete mode 100644 bwlp.config create mode 100644 bwlp.config.template diff --git a/bwlp.config b/bwlp.config deleted file mode 100644 index 4dcf744..0000000 --- a/bwlp.config +++ /dev/null @@ -1,22 +0,0 @@ -# ping name host -# https name host -# thrift name host port SAT/MASTER -# tftp name host port filename ssl(true/false) -https Masterserver HTTPS Service https://bwlp-masterserver.ruf.uni-freiburg.de -https Fail Test 5121236 -https Fail Test https://www.amazony.de/ -ping Masterserver IP Ping 132.230.4.16 -ping Fileserver Ping files.bwlp.ks.uni-freiburg.de -ping Backup fileserver Ping bwlp-backup.ruf.uni-freiburg.de -ping Ping Fail 0.0.0.1 -thrift Thrift SAT 132.230.8.192 9090 SAT -thrift Thrift MASTER 132.230.4.16 9090 MASTER false -# thrift Thrift Timeout 132.230.4.16 9092 MASTER false -thrift Thrift SAT SSL test 132.230.8.192 9091 SAT true -thrift Thrift MASTER SSL test 132.230.4.16 9091 MASTER true -ping BAS Ping bas.intra.uni-freiburg.de -ping yc 127.0.0.2 -ping yx 127.0.0.3 -tftp TFTP bwlp lpxelinux bwlp-pxe.ruf.uni-freiburg.de 69 lpxelinux.0 -tftp TFTP bas ipxe bas.intra.uni-freiburg.de 69 ipxe.0 -tftp TFTP bas fail test bas.intra.uni-freiburg.de 69 failtest.0 \ No newline at end of file diff --git a/bwlp.config.template b/bwlp.config.template new file mode 100644 index 0000000..b12cf1f --- /dev/null +++ b/bwlp.config.template @@ -0,0 +1,4 @@ +# ping +# https +# thrift SAT/MASTER +# tftp ssl(true/false) diff --git a/main.py b/main.py index d685b7c..a719fc6 100755 --- a/main.py +++ b/main.py @@ -68,13 +68,19 @@ def ping(name, hostname): stdout=subprocess.PIPE, stderr=subprocess.PIPE ) + response.wait() + exit_code = response.returncode response = response.communicate() error = response[1].decode('utf-8') - # Error happend - if error != '': + if error != '' or exit_code != 0: + err_msg = '' + if exit_code == 1: + err_msg = 'Destination Host Unreachable' + elif exit_code == 2: + err_msg = error.rstrip() print('\033[91m' + 'error' + '\033[0m') - statusList.append(Status(name, hostname, 'error', 'Offline', 'ping', error.rstrip())) + statusList.append(Status(name, hostname, 'error', 'Offline', 'ping', err_msg)) else: print('\033[92m' + 'success' + '\033[0m') statusList.append(Status(name, hostname, 'success', 'Online', 'ping')) -- cgit v1.2.3-55-g7522