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

Better logging of ws connection for siteCmd CLI action

Browse source
This commit is contained in:
shortcutme 2019-04-12 15:02:04 +02:00
parent 9f5600b7f7
commit 8a38983dfc
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main.py
View file

@ -328,9 +328,15 @@ class Actions(object):
site = SiteManager.site_manager.get(address) site = SiteManager.site_manager.get(address)
if not site:
logging.error("Site not found: %s" % address)
return None
ws = self.getWebsocket(site) ws = self.getWebsocket(site)
ws.send(json.dumps({"cmd": cmd, "params": parameters, "id": 1})) ws.send(json.dumps({"cmd": cmd, "params": parameters, "id": 1}))
res_raw = ws.recv() res_raw = ws.recv()
try: try:
res = json.loads(res_raw) res = json.loads(res_raw)
except Exception as err: except Exception as err:
@ -343,7 +349,10 @@ class Actions(object):
def getWebsocket(self, site): def getWebsocket(self, site):
import websocket import websocket
ws = websocket.create_connection("ws://%s:%s/Websocket?wrapper_key=%s" % (config.ui_ip, config.ui_port, site.settings["wrapper_key"]))
ws_address = "ws://%s:%s/Websocket?wrapper_key=%s" % (config.ui_ip, config.ui_port, site.settings["wrapper_key"])
logging.info("Connecting to %s" % ws_address)
ws = websocket.create_connection(ws_address)
return ws return ws
def sitePublish(self, address, peer_ip=None, peer_port=15441, inner_path="content.json"): def sitePublish(self, address, peer_ip=None, peer_port=15441, inner_path="content.json"):