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

Compatible with Python3 

In Python3:
1. The argument of socket.send is bytes object.
2. The return value of socket.recv is bytes object.
3. Use open() instead of file().
pull/32/head
littlef0x 2019-02-28 16:06:55 +08:00
parent 976b8b9c04
commit c6a5234e37
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clients/client-linux.py
View File

@ -57,7 +57,7 @@ def get_hdd():
return int(size), int(used) return int(size), int(used)
def get_time(): def get_time():
stat_file = file("/proc/stat", "r") stat_file = open("/proc/stat", "r")
time_list = stat_file.readline().split(' ')[2:6] time_list = stat_file.readline().split(' ')[2:6]
stat_file.close() stat_file.close()
for i in range(len(time_list)) : for i in range(len(time_list)) :
@ -265,10 +265,11 @@ if __name__ == '__main__':
print("Connecting...") print("Connecting...")
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.connect((SERVER, PORT)) s.connect((SERVER, PORT))
data = s.recv(1024) data = s.recv(1024).decode()
if data.find("Authentication required") > -1: if data.find("Authentication required") > -1:
s.send(USER + ':' + PASSWORD + '\n') authinfo = USER + ':' + PASSWORD + '\n'
data = s.recv(1024) s.send(authinfo.encode('utf-8'))
data = s.recv(1024).decode()
if data.find("Authentication successful") < 0: if data.find("Authentication successful") < 0:
print(data) print(data)
raise socket.error raise socket.error
@ -277,7 +278,7 @@ if __name__ == '__main__':
raise socket.error raise socket.error
print(data) print(data)
data = s.recv(1024) data = s.recv(1024).decode()
print(data) print(data)
timer = 0 timer = 0
@ -333,7 +334,8 @@ if __name__ == '__main__':
array['time_10086'] = pingTime.get('10086') 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") updateinfo = "update " + json.dumps(array) + "\n"
s.send(updateinfo.encode('utf-8'))
except KeyboardInterrupt: except KeyboardInterrupt:
raise raise
except socket.error: except socket.error: