From c8bca627f044c30f0f1d0f459eb1353b4c1eda6b Mon Sep 17 00:00:00 2001
From: Nimisha Asthagiri <nasthagiri@edx.org>
Date: Thu, 6 Oct 2016 23:43:43 -0400
Subject: [PATCH] Move monitoring from common to openedx/core

---
 cms/envs/common.py                                       | 2 +-
 common/djangoapps/monitoring/startup.py                  | 4 ----
 lms/envs/common.py                                       | 2 +-
 .../core}/djangoapps/monitoring/__init__.py              | 0
 .../core}/djangoapps/monitoring/exceptions.py            | 9 ++++++++-
 .../core}/djangoapps/monitoring/signals.py               | 2 +-
 openedx/core/djangoapps/monitoring/startup.py            | 6 ++++++
 7 files changed, 17 insertions(+), 8 deletions(-)
 delete mode 100644 common/djangoapps/monitoring/startup.py
 rename {common => openedx/core}/djangoapps/monitoring/__init__.py (100%)
 rename {common => openedx/core}/djangoapps/monitoring/exceptions.py (51%)
 rename {common => openedx/core}/djangoapps/monitoring/signals.py (98%)
 create mode 100644 openedx/core/djangoapps/monitoring/startup.py

diff --git a/cms/envs/common.py b/cms/envs/common.py
index 33c9895fc4..3bff79455a 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -868,7 +868,7 @@ INSTALLED_APPS = (
     'embargo',
 
     # Monitoring signals
-    'monitoring',
+    'openedx.core.djangoapps.monitoring',
 
     # Course action state
     'course_action_state',
diff --git a/common/djangoapps/monitoring/startup.py b/common/djangoapps/monitoring/startup.py
deleted file mode 100644
index 9da82409a0..0000000000
--- a/common/djangoapps/monitoring/startup.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# Register signal handlers
-# pylint: disable=unused-import
-import signals
-import exceptions
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 2db516a970..84d26b968b 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -2010,7 +2010,7 @@ INSTALLED_APPS = (
     'embargo',
 
     # Monitoring functionality
-    'monitoring',
+    'openedx.core.djangoapps.monitoring',
 
     # Course action state
     'course_action_state',
diff --git a/common/djangoapps/monitoring/__init__.py b/openedx/core/djangoapps/monitoring/__init__.py
similarity index 100%
rename from common/djangoapps/monitoring/__init__.py
rename to openedx/core/djangoapps/monitoring/__init__.py
diff --git a/common/djangoapps/monitoring/exceptions.py b/openedx/core/djangoapps/monitoring/exceptions.py
similarity index 51%
rename from common/djangoapps/monitoring/exceptions.py
rename to openedx/core/djangoapps/monitoring/exceptions.py
index 6a34d9a38f..2704324938 100644
--- a/common/djangoapps/monitoring/exceptions.py
+++ b/openedx/core/djangoapps/monitoring/exceptions.py
@@ -1,10 +1,17 @@
+"""
+Signal handler for exceptions.
+"""
 from django.core.signals import got_request_exception
 from django.dispatch import receiver
 import logging
 
 
 @receiver(got_request_exception)
-def record_request_exception(sender, **kwargs):
+def record_request_exception(sender, **kwargs):  # pylint: disable=unused-argument
+    """
+    Logs the stack trace whenever an exception
+    occurs in processing a request.
+    """
     logging.exception("Uncaught exception from {sender}".format(
         sender=sender
     ))
diff --git a/common/djangoapps/monitoring/signals.py b/openedx/core/djangoapps/monitoring/signals.py
similarity index 98%
rename from common/djangoapps/monitoring/signals.py
rename to openedx/core/djangoapps/monitoring/signals.py
index f636e7ae51..046cd2b1cc 100644
--- a/common/djangoapps/monitoring/signals.py
+++ b/openedx/core/djangoapps/monitoring/signals.py
@@ -13,7 +13,7 @@ from django.dispatch import receiver
 import dogstats_wrapper as dog_stats_api
 
 
-def _database_tags(action, sender, kwargs):
+def _database_tags(action, sender, kwargs):  # pylint: disable=unused-argument
     """
     Return a tags for the sender and database used in django.db.models signals.
 
diff --git a/openedx/core/djangoapps/monitoring/startup.py b/openedx/core/djangoapps/monitoring/startup.py
new file mode 100644
index 0000000000..b2d5773716
--- /dev/null
+++ b/openedx/core/djangoapps/monitoring/startup.py
@@ -0,0 +1,6 @@
+"""
+Registers signal handlers at startup.
+"""
+# pylint: disable=unused-import
+import openedx.core.djangoapps.monitoring.signals
+import openedx.core.djangoapps.monitoring.exceptions