Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

don't import reactor, set in SqliteConnection

Browse source
This commit is contained in:
Jack Robison 2018-02-27 17:21:22 -05:00
parent bceaaa5724
commit 96d435cebd
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lbrynet/database/storage.py
View file

@ -4,7 +4,7 @@ import time
import sqlite3 import sqlite3
import traceback import traceback
from decimal import Decimal from decimal import Decimal
from twisted.internet import defer, task, reactor, threads from twisted.internet import defer, task, threads
from twisted.enterprise import adbapi from twisted.enterprise import adbapi
from lbryschema.claim import ClaimDict from lbryschema.claim import ClaimDict
@ -73,6 +73,8 @@ def rerun_if_locked(f):
max_attempts = 3 max_attempts = 3
def rerun(err, rerun_count, *args, **kwargs): def rerun(err, rerun_count, *args, **kwargs):
connection = args[0]
reactor = connection.reactor
log.debug("Failed to execute (%s): %s", err, args) log.debug("Failed to execute (%s): %s", err, args)
if err.check(sqlite3.OperationalError) and err.value.message == "database is locked": if err.check(sqlite3.OperationalError) and err.value.message == "database is locked":
log.warning("database was locked. rerunning %s with args %s, kwargs %s", log.warning("database was locked. rerunning %s with args %s, kwargs %s",
@ -82,8 +84,14 @@ def rerun_if_locked(f):
return task.deferLater(reactor, delay, inner_wrapper, rerun_count + 1, *args, **kwargs) return task.deferLater(reactor, delay, inner_wrapper, rerun_count + 1, *args, **kwargs)
raise err raise err
def check_needed_rerun(result, rerun_count):
if rerun_count:
log.info("successfully reran database query")
return result
def inner_wrapper(rerun_count, *args, **kwargs): def inner_wrapper(rerun_count, *args, **kwargs):
d = f(*args, **kwargs) d = f(*args, **kwargs)
d.addCallback(check_needed_rerun, rerun_count)
d.addErrback(rerun, rerun_count, *args, **kwargs) d.addErrback(rerun, rerun_count, *args, **kwargs)
return d return d
@ -101,6 +109,10 @@ class SqliteConnection(adbapi.ConnectionPool):
def runInteraction(self, interaction, *args, **kw): def runInteraction(self, interaction, *args, **kw):
return adbapi.ConnectionPool.runInteraction(self, interaction, *args, **kw) return adbapi.ConnectionPool.runInteraction(self, interaction, *args, **kw)
@classmethod
def set_reactor(cls, reactor):
cls.reactor = reactor
class SQLiteStorage(object): class SQLiteStorage(object):
CREATE_TABLES_QUERY = """ CREATE_TABLES_QUERY = """
@ -165,11 +177,14 @@ class SQLiteStorage(object):
); );
""" """
def __init__(self, db_dir): def __init__(self, db_dir, reactor=None):
if not reactor:
from twisted.internet import reactor
self.db_dir = db_dir self.db_dir = db_dir
self._db_path = os.path.join(db_dir, "lbrynet.sqlite") self._db_path = os.path.join(db_dir, "lbrynet.sqlite")
log.info("connecting to database: %s", self._db_path) log.info("connecting to database: %s", self._db_path)
self.db = SqliteConnection(self._db_path) self.db = SqliteConnection(self._db_path)
self.db.set_reactor(reactor)
def setup(self): def setup(self):
def _create_tables(transaction): def _create_tables(transaction):