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

pass actual database, not config

Browse Source
This commit is contained in:
meejah 2021-02-12 17:39:55 -07:00
parent 83de03c8c6
commit 03906ffe0d
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wormhole_transit_relay/server_state.py
View File

@ -149,15 +149,12 @@ def create_usage_tracker(blur_usage, log_file, usage_db):
""" """
tracker = UsageTracker(blur_usage) tracker = UsageTracker(blur_usage)
if usage_db: if usage_db:
db = get_db(usage_db) tracker.add_backend(DatabaseUsageRecorder(usage_db))
tracker.add_backend(DatabaseUsageRecorder(db))
if log_file: if log_file:
tracker.add_backend(LogFileUsageRecorder(log_file)) tracker.add_backend(LogFileUsageRecorder(log_file))
return tracker return tracker
class UsageTracker(object): class UsageTracker(object):
""" """
Tracks usage statistics of connections Tracks usage statistics of connections

3
src/wormhole_transit_relay/server_tap.py
View File

@ -38,10 +38,11 @@ def makeService(config, reactor=reactor):
if config["log-fd"] is not None if config["log-fd"] is not None
else None else None
) )
db = None if config["usage-db"] is None else get_db(config["usage-db"])
usage = create_usage_tracker( usage = create_usage_tracker(
blur_usage=config["blur-usage"], blur_usage=config["blur-usage"],
log_file=log_file, log_file=log_file,
usage_db=config["usage-db"], usage_db=db,
) )
factory = transit_server.Transit(usage) factory = transit_server.Transit(usage)
parent = MultiService() parent = MultiService()

9
src/wormhole_transit_relay/test/test_stats.py
View File

@ -10,19 +10,16 @@ from ..server_state import create_usage_tracker
from .. import database from .. import database
class DB(unittest.TestCase): class DB(unittest.TestCase):
def open_db(self, dbfile):
db = sqlite3.connect(dbfile)
database._initialize_db_connection(db)
return db
def test_db(self): def test_db(self):
T = 1519075308.0 T = 1519075308.0
d = self.mktemp() d = self.mktemp()
os.mkdir(d) os.mkdir(d)
usage_db = os.path.join(d, "usage.sqlite") usage_db = os.path.join(d, "usage.sqlite")
db = database.get_db(usage_db)
with mock.patch("time.time", return_value=T+0): with mock.patch("time.time", return_value=T+0):
t = Transit(create_usage_tracker(blur_usage=None, log_file=None, usage_db=usage_db)) t = Transit(create_usage_tracker(blur_usage=None, log_file=None, usage_db=db))
db = self.open_db(usage_db) self.assertEqual(len(t.usage._backends), 1)
usage = list(t.usage._backends)[0] usage = list(t.usage._backends)[0]
with mock.patch("time.time", return_value=T+1): with mock.patch("time.time", return_value=T+1):