open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

server: rename stats.json keys

Browse Source
This commit is contained in:
Brian Warner 2016-06-26 12:12:22 -07:00
parent 31be12a4be
commit cd934fdfde
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wormhole/server/rendezvous.py
View File

@ -536,7 +536,7 @@ class Rendezvous(service.MultiService):
stats = {} stats = {}
# current status: expected to be zero most of the time # current status: expected to be zero most of the time
c = stats["current"] = {} c = stats["active"] = {}
c["apps"] = len(self.get_all_apps()) c["apps"] = len(self.get_all_apps())
def q(query, values=()): def q(query, values=()):
row = self._db.execute(query, values).fetchone() row = self._db.execute(query, values).fetchone()
@ -560,7 +560,7 @@ class Rendezvous(service.MultiService):
nameplate_counts[result] += count nameplate_counts[result] += count
for result, count in mc.items(): for result, count in mc.items():
mailbox_counts[result] += count mailbox_counts[result] += count
urb = stats["usage_since_reboot"] = {} urb = stats["since_reboot"] = {}
urb["nameplates"] = {} urb["nameplates"] = {}
for result, count in nameplate_counts.items(): for result, count in nameplate_counts.items():
urb["nameplates"][result] = count urb["nameplates"][result] = count
@ -571,10 +571,9 @@ class Rendezvous(service.MultiService):
urb["total_mailboxes"] = sum(mailbox_counts.values()) urb["total_mailboxes"] = sum(mailbox_counts.values())
# historical usage (all-time) # historical usage (all-time)
u = stats["usage"] = {} u = stats["all_time"] = {}
un = u["nameplates"] = {} un = u["nameplates"] = {}
# TODO: there's probably a single SQL query for all this # TODO: there's probably a single SQL query for all this
un["total"] = q("SELECT COUNT() FROM `nameplate_usage`")
un["happy"] = q("SELECT COUNT() FROM `nameplate_usage`" un["happy"] = q("SELECT COUNT() FROM `nameplate_usage`"
" WHERE `result`='happy'") " WHERE `result`='happy'")
un["lonely"] = q("SELECT COUNT() FROM `nameplate_usage`" un["lonely"] = q("SELECT COUNT() FROM `nameplate_usage`"
@ -583,8 +582,8 @@ class Rendezvous(service.MultiService):
" WHERE `result`='pruney'") " WHERE `result`='pruney'")
un["crowded"] = q("SELECT COUNT() FROM `nameplate_usage`" un["crowded"] = q("SELECT COUNT() FROM `nameplate_usage`"
" WHERE `result`='crowded'") " WHERE `result`='crowded'")
u["total_nameplates"] = q("SELECT COUNT() FROM `nameplate_usage`")
um = u["mailboxes"] = {} um = u["mailboxes"] = {}
um["total"] = q("SELECT COUNT() FROM `mailbox_usage`")
um["happy"] = q("SELECT COUNT() FROM `mailbox_usage`" um["happy"] = q("SELECT COUNT() FROM `mailbox_usage`"
" WHERE `result`='happy'") " WHERE `result`='happy'")
um["scary"] = q("SELECT COUNT() FROM `mailbox_usage`" um["scary"] = q("SELECT COUNT() FROM `mailbox_usage`"
@ -599,8 +598,9 @@ class Rendezvous(service.MultiService):
" WHERE `result`='pruney'") " WHERE `result`='pruney'")
um["crowded"] = q("SELECT COUNT() FROM `mailbox_usage`" um["crowded"] = q("SELECT COUNT() FROM `mailbox_usage`"
" WHERE `result`='crowded'") " WHERE `result`='crowded'")
um["standalone"] = q("SELECT COUNT() FROM `mailbox_usage`" u["total_mailboxes"] = q("SELECT COUNT() FROM `mailbox_usage`")
" WHERE `for_nameplate`=0") u["standalone_mailboxes"] = q("SELECT COUNT() FROM `mailbox_usage`"
" WHERE `for_nameplate`=0")
# recent timings (last 100 operations) # recent timings (last 100 operations)
# TODO: median/etc of nameplate.total_time # TODO: median/etc of nameplate.total_time