github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-27 03:00:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Attach event listeners in db manager instead of app globals.

Browse Source 
Makes it possible to create an engine without event listeners if desired,
occasionally useful in scripts.
This commit is contained in:
shlurbee
2014-03-06 15:00:31 -08:00
parent 4bb9fa3e88
commit aff92cc6fa
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
r2/r2/lib/app_globals.py
View File

@@ -589,11 +589,6 @@ class Globals(object):
self.startup_timer.intermediate("cassandra")
################# POSTGRES
event.listens_for(engine.Engine, 'before_cursor_execute')(
self.stats.pg_before_cursor_execute)
event.listens_for(engine.Engine, 'after_cursor_execute')(
self.stats.pg_after_cursor_execute)
self.dbm = self.load_db_params()
self.startup_timer.intermediate("postgres")

14
r2/r2/lib/manager/db_manager.py
View File

@@ -35,7 +35,7 @@ APPLICATION_NAME = "reddit@%s:%d" % (socket.gethostname(), os.getpid())
def get_engine(name, db_host='', db_user='', db_pass='', db_port='5432',
pool_size=5, max_overflow=5):
pool_size=5, max_overflow=5, g_override=None):
db_port = int(db_port)
arguments = {
@@ -50,7 +50,7 @@ def get_engine(name, db_host='', db_user='', db_pass='', db_port='5432',
arguments["password"] = db_pass
dsn = "%20".join("%s=%s" % x for x in arguments.iteritems())
return sqlalchemy.create_engine(
engine = sqlalchemy.create_engine(
'postgresql:///?dsn=' + dsn,
strategy='threadlocal',
pool_size=int(pool_size),
@@ -60,6 +60,14 @@ def get_engine(name, db_host='', db_user='', db_pass='', db_port='5432',
use_native_unicode=False,
)
if g_override:
sqlalchemy.event.listens_for(engine, 'before_cursor_execute')(
g_override.stats.pg_before_cursor_execute)
sqlalchemy.event.listens_for(engine, 'after_cursor_execute')(
g_override.stats.pg_after_cursor_execute)
return engine
class db_manager:
def __init__(self):
@@ -83,7 +91,7 @@ class db_manager:
self.avoid_master_reads[name] = avoid_master
def setup_db(self, db_name, g_override=None, **params):
engine = get_engine(**params)
engine = get_engine(g_override=g_override, **params)
self._engines[db_name] = engine
self.test_engine(engine, g_override)