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

Global announcer statistics admin API call

Browse source
This commit is contained in:
shortcutme 2018-07-16 01:48:27 +02:00
parent 7475fa69fa
commit d772280147
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/Ui/UiWebsocket.py
View file

@ -23,9 +23,10 @@ class UiWebsocket(object):
admin_commands = set([ admin_commands = set([
"sitePause", "siteResume", "siteDelete", "siteList", "siteSetLimit", "siteAdd", "sitePause", "siteResume", "siteDelete", "siteList", "siteSetLimit", "siteAdd",
"channelJoinAllsite", "serverUpdate", "serverPortcheck", "serverShutdown", "serverShowdirectory", "serverGetWrapperNonce", "channelJoinAllsite", "serverUpdate", "serverPortcheck", "serverShutdown", "serverShowdirectory", "serverGetWrapperNonce",
"certSet", "configSet", "permissionAdd", "permissionRemove" "certSet", "configSet", "permissionAdd", "permissionRemove", "announcerStats"
]) ])
async_commands = set(["fileGet", "fileList", "dirList", "fileNeed"]) async_commands = set(["fileGet", "fileList", "dirList", "fileNeed"])
def __init__(self, ws, site, server, user, request): def __init__(self, ws, site, server, user, request):
self.ws = ws self.ws = ws
self.site = site self.site = site
@ -187,7 +188,6 @@ class UiWebsocket(object):
announcer_info.update(params[1]) announcer_info.update(params[1])
self.cmd("setAnnouncerInfo", announcer_info) self.cmd("setAnnouncerInfo", announcer_info)
# Send response to client (to = message.id) # Send response to client (to = message.id)
def response(self, to, result): def response(self, to, result):
self.send({"cmd": "response", "to": to, "result": result}) self.send({"cmd": "response", "to": to, "result": result})
@ -378,8 +378,8 @@ class UiWebsocket(object):
# Server variables # Server variables
def actionServerInfo(self, to): def actionServerInfo(self, to):
ret = self.formatServerInfo() back = self.formatServerInfo()
self.response(to, ret) self.response(to, back)
# Create a new wrapper nonce that allows to load html file # Create a new wrapper nonce that allows to load html file
def actionServerGetWrapperNonce(self, to): def actionServerGetWrapperNonce(self, to):
@ -387,8 +387,23 @@ class UiWebsocket(object):
self.response(to, wrapper_nonce) self.response(to, wrapper_nonce)
def actionAnnouncerInfo(self, to): def actionAnnouncerInfo(self, to):
ret = self.formatAnnouncerInfo(self.site) back = self.formatAnnouncerInfo(self.site)
self.response(to, ret) self.response(to, back)
def actionAnnouncerStats(self, to):
back = {}
for site in self.server.sites.values():
for tracker, stats in site.announcer.stats.iteritems():
if tracker not in back:
back[tracker] = {}
is_latest_data = stats["time_request"] > back[tracker].get("time_request", 0)
for key, val in stats.iteritems():
if key.startswith("num_"):
back[tracker][key] = back[tracker].get(key, 0) + val
elif is_latest_data:
back[tracker][key] = val
return back
# Sign content.json # Sign content.json
def actionSiteSign(self, to, privatekey=None, inner_path="content.json", remove_missing_optional=False, update_changed_files=False, response_ok=True): def actionSiteSign(self, to, privatekey=None, inner_path="content.json", remove_missing_optional=False, update_changed_files=False, response_ok=True):