tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Indirect evt_count updates via method call

Browse source 
so that we can stub it for the sentinel and not have a billion failing UTs
This commit is contained in:
Richard van der Hoff 2018-06-22 10:42:28 +01:00
parent b088aafcae
commit 0495fe0035
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
synapse/storage/events_worker.py
View file

@ -147,7 +147,7 @@ class EventsWorkerStore(SQLBaseStore):
if missing_events_ids: if missing_events_ids:
log_ctx = LoggingContext.current_context() log_ctx = LoggingContext.current_context()
log_ctx.evt_db_fetch_count += len(missing_events_ids) log_ctx.record_event_fetch(len(missing_events_ids))
missing_events = yield self._enqueue_events( missing_events = yield self._enqueue_events(
missing_events_ids, missing_events_ids,

11
synapse/util/logcontext.py
View file

@ -91,6 +91,9 @@ class LoggingContext(object):
def add_database_scheduled(self, sched_sec): def add_database_scheduled(self, sched_sec):
pass pass
def record_event_fetch(self, event_count):
pass
def __nonzero__(self): def __nonzero__(self):
return False return False
__bool__ = __nonzero__ # python3 __bool__ = __nonzero__ # python3
@ -247,6 +250,14 @@ class LoggingContext(object):
""" """
self.db_sched_duration_sec += sched_sec self.db_sched_duration_sec += sched_sec
def record_event_fetch(self, event_count):
"""Record a number of events being fetched from the db
Args:
event_count (int): number of events being fetched
"""
self.evt_db_fetch_count += event_count
class LoggingContextFilter(logging.Filter): class LoggingContextFilter(logging.Filter):
"""Logging filter that adds values from the current logging context to each """Logging filter that adds values from the current logging context to each