Move monitor.py to common/monitor.py

module_build_service/common/messaging.py

@@ -25,7 +25,7 @@ def publish(topic, msg, conf, service):
             "No messaging backend found for %r in %r" % (conf.messaging, _messaging_backends.keys())
         )
 
-    from module_build_service.monitor import (
+    from module_build_service.common.monitor import (
         messaging_tx_to_send_counter,
         messaging_tx_sent_ok_counter,
         messaging_tx_failed_counter,

module_build_service/scheduler/consumer.py

@@ -20,8 +20,7 @@ import moksha.hub
 import sqlalchemy.exc
 
 import module_build_service.common.messaging
-import module_build_service.monitor as monitor
-
+import module_build_service.common.monitor as monitor
 from module_build_service import models, log, conf
 from module_build_service.scheduler.db_session import db_session
 from module_build_service.errors import IgnoreMessage

module_build_service/scheduler/db_session.py

@@ -19,7 +19,7 @@ def _setup_event_listeners(db_session):
         sqlalchemy.event.listen(db_session, "before_commit", session_before_commit_handlers)
 
     # initialize DB event listeners from the monitor module
-    from module_build_service.monitor import db_hook_event_listeners
+    from module_build_service.common.monitor import db_hook_event_listeners
 
     db_hook_event_listeners(db_session.bind.engine)
 

module_build_service/views.py

@@ -15,7 +15,7 @@ from module_build_service import app, conf, log, models, db, version, api_versio
 from module_build_service.common.utils import import_mmd
 from module_build_service.errors import ValidationError, Forbidden, NotFound, ProgrammingError
 from module_build_service.web.backports import jsonify
-from module_build_service.monitor import registry
+from module_build_service.common.monitor import registry
 from module_build_service.common.submit import fetch_mmd
 import module_build_service.web.auth
 from module_build_service.web.submit import (