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

fix for wormhole-server count-* functions

Browse Source 
broken when we switched to dictfactory on db
This commit is contained in:
laharah 2016-06-04 16:50:56 -07:00
parent 7042a01369
commit 2a056059c0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wormhole/server/cmd_usage.py
View File

@ -150,7 +150,7 @@ def count_channels(args):
c_dict[key] = value c_dict[key] = value
OLD = time.time() - 10*60 OLD = time.time() - 10*60
def q(query, values=()): def q(query, values=()):
return db.execute(query, values).fetchone()[0] return list(db.execute(query, values).fetchone().values())[0]
add("apps", q("SELECT COUNT(DISTINCT(`app_id`)) FROM `nameplates`")) add("apps", q("SELECT COUNT(DISTINCT(`app_id`)) FROM `nameplates`"))
add("total nameplates", q("SELECT COUNT() FROM `nameplates`")) add("total nameplates", q("SELECT COUNT() FROM `nameplates`"))
@ -196,7 +196,7 @@ def count_events(args):
c_list.append((key, value)) c_list.append((key, value))
c_dict[key] = value c_dict[key] = value
def q(query, values=()): def q(query, values=()):
return db.execute(query, values).fetchone()[0] return list(db.execute(query, values).fetchone().values())[0]
add("apps", q("SELECT COUNT(DISTINCT(`app_id`)) FROM `nameplate_usage`")) add("apps", q("SELECT COUNT(DISTINCT(`app_id`)) FROM `nameplate_usage`"))