oxen-io/lokinet
1
1
Fork 0
mirror of https://github.com/oxen-io/lokinet synced 2023-12-14 06:53:00 +01:00
Code Issues Projects Releases Wiki Activity

bugfixes for lokinetmon (#1426)

Browse source 
* bugfixes for lokinetmon

* move call to fetch version to before mainloop
This commit is contained in:
Jeff 2020-10-27 15:03:06 -04:00 committed by GitHub
parent 4f3775c28c
commit e731eab4b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
contrib/py/admin/lokinetmon
View file

@ -43,7 +43,8 @@ class Monitor:
def update_data(self):
"""update data from lokinet"""
try:
self.data = json.loads(self.rpc("llarp.status"))
data = json.loads(self.rpc("llarp.status"))
self.data = data['result']
except:
self.data = None
return self.data is not None and self._run
@ -248,7 +249,7 @@ class Monitor:
""" display links """
y_pos += 1
self.win.move(y_pos, 1)
sessions = link["sessions"]["established"]
sessions = link["sessions"]["established"] or []
for sess in sessions:
y_pos = self.display_link_session(y_pos, sess)
return y_pos
@ -309,9 +310,10 @@ class Monitor:
return y_pos
def display_data(self):
"""draw main window"""
""" draw main window """
if self.data is not None:
self.win.addstr(1, 1, self.rpc("llarp.version"))
if self.version:
self.win.addstr(1, 1, self.version)
services = self.data["services"] or {}
y_pos = 3
try:
@ -319,14 +321,19 @@ class Monitor:
for key in services:
y_pos = self.display_service(y_pos, key, services[key])
y_pos = self.display_dht(y_pos, self.data["dht"])
except Exception as e:
print(e)
except:
pass
else:
self.win.move(1, 1)
self.win.addstr("lokinet offline")
def run(self):
""" run mainloop """
try:
self.version = json.loads(self.rpc("llarp.version"))['result']['version']
except:
self.version = None
while self._run:
if self.update_data():
self.win.box()