github
/
ServerStatus
mirror of https://github.com/cppla/ServerStatus
1
0
Fork 0
Code Issues Releases Wiki Activity

add ping time delay

pull/55/head
ubuntu 2018-12-21 18:17:54 +08:00
parent a8db447a3f
commit 85f361b4b4
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clients/client-linux.py
View File

@ -14,6 +14,7 @@ INTERVAL = 1 #更新间隔
import socket import socket
import time import time
import timeit
import re import re
import os import os
import sys import sys
@ -177,6 +178,11 @@ lostRate = {
'189': 0.0, '189': 0.0,
'10086': 0.0 '10086': 0.0
} }
pingTime = {
'10010': 0,
'189': 0,
'10086': 0
}
def _ping_thread(host, mark, port): def _ping_thread(host, mark, port):
lostPacket = 0 lostPacket = 0
allPacket = 0 allPacket = 0
@ -186,7 +192,9 @@ def _ping_thread(host, mark, port):
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.settimeout(1) s.settimeout(1)
try: try:
b = timeit.default_timer()
s.connect((host, port)) s.connect((host, port))
pingTime[mark] = int((timeit.default_timer()-b)*1000)
except: except:
lostPacket += 1 lostPacket += 1
finally: finally:
@ -318,6 +326,9 @@ if __name__ == '__main__':
array['ping_10010'] = lostRate.get('10010') * 100 array['ping_10010'] = lostRate.get('10010') * 100
array['ping_189'] = lostRate.get('189') * 100 array['ping_189'] = lostRate.get('189') * 100
array['ping_10086'] = lostRate.get('10086') * 100 array['ping_10086'] = lostRate.get('10086') * 100
array['time_10010'] = pingTime.get('10010')
array['time_189'] = pingTime.get('189')
array['time_10086'] = pingTime.get('10086')
array['tcp'], array['udp'], array['process'], array['thread'] = tupd() array['tcp'], array['udp'], array['process'], array['thread'] = tupd()
s.send("update " + json.dumps(array) + "\n") s.send("update " + json.dumps(array) + "\n")

13
clients/client-psutil.py
View File

@ -15,6 +15,7 @@ INTERVAL = 1 # 更新间隔
import socket import socket
import time import time
import timeit
import os import os
import json import json
import collections import collections
@ -110,7 +111,7 @@ def tupd():
t = int(os.popen('netstat -an|find "TCP" /c').read()[:-1])-1 t = int(os.popen('netstat -an|find "TCP" /c').read()[:-1])-1
u = int(os.popen('netstat -an|find "UDP" /c').read()[:-1])-1 u = int(os.popen('netstat -an|find "UDP" /c').read()[:-1])-1
p = len(psutil.pids()) p = len(psutil.pids())
# cpu? # cpu is high, wait fix
d = sum([psutil.Process(k).num_threads() for k in [x for x in psutil.pids()]]) d = sum([psutil.Process(k).num_threads() for k in [x for x in psutil.pids()]])
return t,u,p,d return t,u,p,d
@ -148,6 +149,11 @@ lostRate = {
'189': 0.0, '189': 0.0,
'10086': 0.0 '10086': 0.0
} }
pingTime = {
'10010': 0,
'189': 0,
'10086': 0
}
def _ping_thread(host, mark, port): def _ping_thread(host, mark, port):
lostPacket = 0 lostPacket = 0
allPacket = 0 allPacket = 0
@ -157,7 +163,9 @@ def _ping_thread(host, mark, port):
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.settimeout(1) s.settimeout(1)
try: try:
b = timeit.default_timer()
s.connect((host, port)) s.connect((host, port))
pingTime[mark] = int((timeit.default_timer() - b) * 1000)
except: except:
lostPacket += 1 lostPacket += 1
finally: finally:
@ -290,6 +298,9 @@ if __name__ == '__main__':
array['ping_10010'] = lostRate.get('10010') * 100 array['ping_10010'] = lostRate.get('10010') * 100
array['ping_189'] = lostRate.get('189') * 100 array['ping_189'] = lostRate.get('189') * 100
array['ping_10086'] = lostRate.get('10086') * 100 array['ping_10086'] = lostRate.get('10086') * 100
array['time_10010'] = pingTime.get('10010')
array['time_189'] = pingTime.get('189')
array['time_10086'] = pingTime.get('10086')
array['tcp'], array['udp'], array['process'], array['thread'] = tupd() array['tcp'], array['udp'], array['process'], array['thread'] = tupd()
s.send("update " + json.dumps(array) + "\n") s.send("update " + json.dumps(array) + "\n")