From 0b872afe59c062ed816a8c6951129158dd8fc904 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 14 Aug 2012 15:33:32 -0400 Subject: [PATCH] cc-4105: added docstrings and fixed code formatting --- .../media-monitor2/media/monitor/eventcontractor.py | 7 +++++++ .../media-monitor2/media/monitor/eventdrainer.py | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/python_apps/media-monitor2/media/monitor/eventcontractor.py b/python_apps/media-monitor2/media/monitor/eventcontractor.py index 639a4fbf1..cf1669210 100644 --- a/python_apps/media-monitor2/media/monitor/eventcontractor.py +++ b/python_apps/media-monitor2/media/monitor/eventcontractor.py @@ -10,9 +10,16 @@ class EventContractor(Loggable): self.store = {} def event_registered(self, evt): + """ + returns true if the event is registered which means that there is + another "unpacked" event somewhere out there with the same path + """ return evt.path in self.store def get_old_event(self, evt): + """ + get the previously registered event with the same path as 'evt' + """ return self.store[ evt.path ] def register(self, evt): diff --git a/python_apps/media-monitor2/media/monitor/eventdrainer.py b/python_apps/media-monitor2/media/monitor/eventdrainer.py index ea75132c6..69f997bf0 100644 --- a/python_apps/media-monitor2/media/monitor/eventdrainer.py +++ b/python_apps/media-monitor2/media/monitor/eventdrainer.py @@ -9,11 +9,11 @@ class EventDrainer(Loggable): """ def __init__(self, connection, interval=1): def cb(): - try: connection.drain_events(timeout=0.3) - except socket.timeout: pass - except Exception as e: - self.logger.error("Error flushing events") - self.logger.error( str(e) ) - t = RepeatTimer(interval, cb) + try : connection.drain_events(timeout=0.3) + except socket.timeout : pass + except Exception as e : + self.fatal_exception("Error flushing events", e) + + t = RepeatTimer(interval, cb) t.daemon = True t.start()