spark-store-project/ServerStatus
14
0
Fork 0
mirror of https://github.com//cppla/ServerStatus synced 2025-07-07 09:55:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipv4 & ipv6

Browse Source
This commit is contained in:
macos 2020-06-17 19:25:37 +08:00
parent da968a776d
commit 6483683174
2 changed files with 6 additions and 18 deletions

12
clients/client-linux.py

@ -116,9 +116,7 @@ def ip_status():
ip_check = 0 ip_check = 0
for i in [CU, CT, CM]: for i in [CU, CT, CM]:
try: try:
s = socket.create_connection((i, PORBEPORT), timeout=1) socket.create_connection((i, PORBEPORT), timeout=1).close()
s.close()
del s
except: except:
ip_check += 1 ip_check += 1
if ip_check >= 2: if ip_check >= 2:
@ -132,8 +130,7 @@ def get_network(ip_version):
elif(ip_version == 6): elif(ip_version == 6):
HOST = "ipv6.google.com" HOST = "ipv6.google.com"
try: try:
s = socket.create_connection((HOST, 80), 2) socket.create_connection((HOST, 80), 2).close()
s.close()
return True return True
except: except:
return False return False
@ -163,17 +160,14 @@ def _ping_thread(host, mark, port):
startTime = time.time() startTime = time.time()
while True: while True:
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.settimeout(1)
try: try:
b = timeit.default_timer() b = timeit.default_timer()
s.connect((host, port)) socket.create_connection((host, port), timeout=1).close()
pingTime[mark] = int((timeit.default_timer()-b)*1000) pingTime[mark] = int((timeit.default_timer()-b)*1000)
except: except:
lostPacket += 1 lostPacket += 1
finally: finally:
allPacket += 1 allPacket += 1
s.close()
if allPacket > 100: if allPacket > 100:
lostRate[mark] = float(lostPacket) / allPacket lostRate[mark] = float(lostPacket) / allPacket

12
clients/client-psutil.py

@ -100,9 +100,7 @@ def ip_status():
ip_check = 0 ip_check = 0
for i in [CU, CT, CM]: for i in [CU, CT, CM]:
try: try:
s = socket.create_connection((i, PORBEPORT), timeout=1) socket.create_connection((i, PORBEPORT), timeout=1).close()
s.close()
del s
except: except:
ip_check += 1 ip_check += 1
if ip_check >= 2: if ip_check >= 2:
@ -116,8 +114,7 @@ def get_network(ip_version):
elif(ip_version == 6): elif(ip_version == 6):
HOST = "ipv6.google.com" HOST = "ipv6.google.com"
try: try:
s = socket.create_connection((HOST, 80), 2) socket.create_connection((HOST, 80), 2).close()
s.close()
return True return True
except: except:
return False return False
@ -147,17 +144,14 @@ def _ping_thread(host, mark, port):
startTime = time.time() startTime = time.time()
while True: while True:
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.settimeout(1)
try: try:
b = timeit.default_timer() b = timeit.default_timer()
s.connect((host, port)) socket.create_connection((host, port), timeout=1).close()
pingTime[mark] = int((timeit.default_timer() - b) * 1000) pingTime[mark] = int((timeit.default_timer() - b) * 1000)
except: except:
lostPacket += 1 lostPacket += 1
finally: finally:
allPacket += 1 allPacket += 1
s.close()
if allPacket > 100: if allPacket > 100:
lostRate[mark] = float(lostPacket) / allPacket lostRate[mark] = float(lostPacket) / allPacket