mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
added cpu, ram and version information
This commit is contained in:
parent
da535d6636
commit
ba620ab847
1 changed files with 3 additions and 2 deletions
|
@ -17,7 +17,7 @@ import json
|
||||||
import subprocess
|
import subprocess
|
||||||
import os
|
import os
|
||||||
import static
|
import static
|
||||||
|
import psutil
|
||||||
#PORT = 3001
|
#PORT = 3001
|
||||||
#TNCPROCESS = 0
|
#TNCPROCESS = 0
|
||||||
#TNCSTARTED = False
|
#TNCSTARTED = False
|
||||||
|
@ -78,6 +78,7 @@ class CMDTCPRequestHandler(socketserver.BaseRequestHandler):
|
||||||
|
|
||||||
try:
|
try:
|
||||||
received_json = json.loads(data)
|
received_json = json.loads(data)
|
||||||
|
print(received_json)
|
||||||
|
|
||||||
except:
|
except:
|
||||||
received_json = ''
|
received_json = ''
|
||||||
|
@ -130,7 +131,7 @@ class CMDTCPRequestHandler(socketserver.BaseRequestHandler):
|
||||||
|
|
||||||
if received_json["type"] == 'GET' and received_json["command"] == 'DAEMON_STATE':
|
if received_json["type"] == 'GET' and received_json["command"] == 'DAEMON_STATE':
|
||||||
|
|
||||||
data = {'COMMAND' : 'DAEMON_STATE', 'DAEMON_STATE' : [], 'INPUT_DEVICES': [], 'OUTPUT_DEVICES': []}
|
data = {'COMMAND' : 'DAEMON_STATE', 'DAEMON_STATE' : [], 'INPUT_DEVICES': [], 'OUTPUT_DEVICES': [],"CPU": str(psutil.cpu_percent()),"RAM": str(psutil.virtual_memory().percent), "VERSION": "0.1-prototype"}
|
||||||
|
|
||||||
if static.TNCSTARTED:
|
if static.TNCSTARTED:
|
||||||
data["DAEMON_STATE"].append({"STATUS": "running"})
|
data["DAEMON_STATE"].append({"STATUS": "running"})
|
||||||
|
|
Loading…
Reference in a new issue