spark-store-project/ServerStatus
15
0
Fork 0
mirror of https://github.com//cppla/ServerStatus synced 2025-10-09 10:22:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

take 'Connection Refused' as a successful ping probe

Browse Source
This commit is contained in:
King's Way 2021-07-03 15:26:39 +08:00
parent 05f9784b1e
commit fdf5f03a13
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clients/client-linux.py
View File

@ -28,6 +28,7 @@ import re
import os import os
import sys import sys
import json import json
import errno
import subprocess import subprocess
import threading import threading
try: try:
@ -183,7 +184,12 @@ def _ping_thread(host, mark, port):
socket.create_connection((IP, port), timeout=1).close() socket.create_connection((IP, port), timeout=1).close()
pingTime[mark] = int((timeit.default_timer() - b) * 1000) pingTime[mark] = int((timeit.default_timer() - b) * 1000)
packet_queue.put(1) packet_queue.put(1)
except: except socket.error as error:
if error.errno == errno.ECONNREFUSED:
pingTime[mark] = int((timeit.default_timer() - b) * 1000)
packet_queue.put(1)
#elif error.errno == errno.ETIMEDOUT:
else:
lostPacket += 1 lostPacket += 1
packet_queue.put(0) packet_queue.put(0)

7
clients/client-psutil.py
View File

@ -168,7 +168,12 @@ def _ping_thread(host, mark, port):
socket.create_connection((IP, port), timeout=1).close() socket.create_connection((IP, port), timeout=1).close()
pingTime[mark] = int((timeit.default_timer() - b) * 1000) pingTime[mark] = int((timeit.default_timer() - b) * 1000)
packet_queue.put(1) packet_queue.put(1)
except: except socket.error as error:
if error.errno == errno.ECONNREFUSED:
pingTime[mark] = int((timeit.default_timer() - b) * 1000)
packet_queue.put(1)
#elif error.errno == errno.ETIMEDOUT:
else:
lostPacket += 1 lostPacket += 1
packet_queue.put(0) packet_queue.put(0)