diff --git a/python_apps/media-monitor2/media/monitor/owners.py b/python_apps/media-monitor2/media/monitor/owners.py index 85cbf3430..2d6c4be44 100644 --- a/python_apps/media-monitor2/media/monitor/owners.py +++ b/python_apps/media-monitor2/media/monitor/owners.py @@ -12,7 +12,9 @@ def reset_owners(): def get_owner(f): """ Get the owner id of the file 'f' """ - return owners[f] if f in owners else -1 + o = owners[f] if f in owners else -1 + log.info("Received owner for %s. Owner: %s" % (f, o)) + return o def add_file_owner(f,owner): diff --git a/python_apps/media-monitor2/media/monitor/request.py b/python_apps/media-monitor2/media/monitor/request.py index a2f3cdc8f..a49c6bb25 100644 --- a/python_apps/media-monitor2/media/monitor/request.py +++ b/python_apps/media-monitor2/media/monitor/request.py @@ -52,8 +52,6 @@ class RequestSync(Loggable): self.logger.info("ApiController.php probably crashed, we \ diagnose this from the fact that it did not return \ valid json") - self.logger.info("Trying again after %f seconds" % - self.request_wait) except Exception as e: self.unexpected_exception(e) else: self.logger.info("Request was successful") self.watcher.flag_done() # poor man's condition variable diff --git a/python_apps/media-monitor2/tests/test_owners.py b/python_apps/media-monitor2/tests/test_owners.py index 04788cf4c..8dfa6ad10 100644 --- a/python_apps/media-monitor2/tests/test_owners.py +++ b/python_apps/media-monitor2/tests/test_owners.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import unittest -import media.monitor.owners as owners +from media.monitor import owners class TestMMP(unittest.TestCase): def setUp(self):