From 893f9509fa477eb397bb41a0543009525309e289 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 16 Oct 2012 18:35:56 -0400 Subject: [PATCH] cc-4556: fixed --- python_apps/media-monitor2/media/monitor/events.py | 2 +- python_apps/media-monitor2/media/monitor/watchersyncer.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/python_apps/media-monitor2/media/monitor/events.py b/python_apps/media-monitor2/media/monitor/events.py index 932c78d69..a8ccc3b54 100644 --- a/python_apps/media-monitor2/media/monitor/events.py +++ b/python_apps/media-monitor2/media/monitor/events.py @@ -43,7 +43,7 @@ class EventRegistry(object): methods") -class EventProxy(object): +class EventProxy(Loggable): """ A container object for instances of BaseEvent (or it's subclasses) used for event contractor diff --git a/python_apps/media-monitor2/media/monitor/watchersyncer.py b/python_apps/media-monitor2/media/monitor/watchersyncer.py index 61146326a..e7a2cf9c0 100644 --- a/python_apps/media-monitor2/media/monitor/watchersyncer.py +++ b/python_apps/media-monitor2/media/monitor/watchersyncer.py @@ -126,7 +126,8 @@ class WatchSyncer(ReportHandler,Loggable): try: # If there is a strange bug anywhere in the code the next line # should be a suspect - if self.contractor.register(EventProxy(event)): self.push_queue( event ) + ev = EventProxy(event) + if self.contractor.register(ev): self.push_queue(ev) #self.push_queue( event ) except BadSongFile as e: self.fatal_exception("Received bas song file '%s'" % e.path, e)