oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Connection time correction on stats page

Browse source
This commit is contained in:
shortcutme 2018-08-29 19:57:38 +02:00
parent 0efa6a5816
commit ad02f384d2
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/Stats/StatsPlugin.py
View file

@ -97,12 +97,16 @@ class UiRequestPlugin(object):
) )
yield "<table class='connections'><tr> <th>id</th> <th>type</th> <th>ip</th> <th>open</th> <th>crypt</th> <th>ping</th>" yield "<table class='connections'><tr> <th>id</th> <th>type</th> <th>ip</th> <th>open</th> <th>crypt</th> <th>ping</th>"
yield "<th>buff</th> <th>bad</th> <th>idle</th> <th>open</th> <th>delay</th> <th>cpu</th> <th>out</th> <th>in</th> <th>last sent</th>" yield "<th>buff</th> <th>bad</th> <th>idle</th> <th>open</th> <th>delay</th> <th>cpu</th> <th>out</th> <th>in</th> <th>last sent</th>"
yield "<th>wait</th> <th>version</th> <th>sites</th> </tr>" yield "<th>wait</th> <th>version</th> <th>time</th> <th>sites</th> </tr>"
for connection in main.file_server.connections: for connection in main.file_server.connections:
if "cipher" in dir(connection.sock): if "cipher" in dir(connection.sock):
cipher = connection.sock.cipher()[0] cipher = connection.sock.cipher()[0]
else: else:
cipher = connection.crypt cipher = connection.crypt
if "time" in connection.handshake and connection.last_ping_delay:
time_correction = connection.handshake["time"] - connection.handshake_time - connection.last_ping_delay
else:
time_correction = 0.0
yield self.formatTableRow([ yield self.formatTableRow([
("%3d", connection.id), ("%3d", connection.id),
("%s", connection.type), ("%s", connection.type),
@ -114,13 +118,14 @@ class UiRequestPlugin(object):
("%s", connection.bad_actions), ("%s", connection.bad_actions),
("since", max(connection.last_send_time, connection.last_recv_time)), ("since", max(connection.last_send_time, connection.last_recv_time)),
("since", connection.start_time), ("since", connection.start_time),
("%.3f", connection.last_sent_time - connection.last_send_time), ("%.3f", max(-1, connection.last_sent_time - connection.last_send_time)),
("%.3f", connection.cpu_time), ("%.3f", connection.cpu_time),
("%.0fkB", connection.bytes_sent / 1024), ("%.0fkB", connection.bytes_sent / 1024),
("%.0fkB", connection.bytes_recv / 1024), ("%.0fkB", connection.bytes_recv / 1024),
("<span title='Recv: %s'>%s</span>", (connection.last_cmd_recv, connection.last_cmd_sent)), ("<span title='Recv: %s'>%s</span>", (connection.last_cmd_recv, connection.last_cmd_sent)),
("%s", connection.waiting_requests.keys()), ("%s", connection.waiting_requests.keys()),
("%s r%s", (connection.handshake.get("version"), connection.handshake.get("rev", "?"))), ("%s r%s", (connection.handshake.get("version"), connection.handshake.get("rev", "?"))),
("%.2fs", time_correction),
("%s", connection.sites) ("%s", connection.sites)
]) ])
yield "</table>" yield "</table>"