Merge pull request #2757 from andymckay/1028952

shut the hell up raven
mozilla · Nov 28, 2014 · bb19cec · bb19cec
2 parents 938d7f6 + 8f43dae
commit bb19cec
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 2 deletions.
diff --git a/manage.py b/manage.py
@@ -23,6 +23,10 @@
 mod = Markup.__mod__
 trans_log = logging.getLogger('z.trans')
 
+# Load this early so that anything else you import will use these log settings.
+# Mostly to shut Raven the hell up.
+from lib.log_settings_base import log_configure
+log_configure()
 
 # waffle and amo form an import cycle because amo patches waffle and
 # waffle loads the user model, so we have to make sure amo gets
@@ -49,8 +53,6 @@ def new(self, arg):
 # Import for side-effect: configures our logging handlers.
 # pylint: disable-msg=W0611
 from lib.utils import update_csp, validate_modules, validate_settings
-from lib.log_settings_base import log_configure
-log_configure()
 update_csp()
 validate_modules()
 validate_settings()

diff --git a/mkt/settings.py b/mkt/settings.py
@@ -221,8 +221,10 @@
         'z.heka': {'level': logging.INFO},
         'z.elasticsearch': {'level': logging.INFO},
         'z.task': {'level': logging.INFO},
+        'raven': {'level': logging.WARNING},
     },
 }
+
 LOGGING_CONFIG = None
 
 MANAGERS = ADMINS

diff --git a/mkt/site/fixtures/init.json b/mkt/site/fixtures/init.json
@@ -1738,5 +1738,58 @@
         },
         "model": "waffle.flag",
         "pk": 20
+    },
+    {
+        "fields": {
+            "created": "2014-11-28T14:06:18",
+            "deleted": false,
+            "display_name": "",
+            "email": "amckay+docker-api@mozilla.com",
+            "enable_recommendations": true,
+            "failed_login_attempts": 0,
+            "is_verified": true,
+            "lang": null,
+            "last_login": "2014-11-28T14:06:18",
+            "last_login_attempt": null,
+            "last_login_attempt_ip": "",
+            "last_login_ip": "",
+            "modified": "2014-11-28T14:06:18",
+            "password": "",
+            "read_dev_agreement": null,
+            "region": null,
+            "source": 0,
+            "username": ""
+        },
+        "model": "users.userprofile",
+        "pk": 1
+    },
+    {
+        "fields": {
+            "app_name": "",
+            "created": "2014-11-28T14:12:18",
+            "key": "mkt:default:1:amckay+docker-api@mozilla.com",
+            "modified": "2014-11-28T14:12:18",
+            "redirect_uri": "",
+            "secret": "some-secret-eh?",
+            "user": 1
+        },
+        "model": "api.access",
+        "pk": 1
+    },
+    {
+        "fields": {
+            "group": 50067,
+            "user": 1
+        },
+        "model": "access.groupuser",
+        "pk": 1
+    },
+    {
+        "fields": {
+            "group": 50068,
+            "user": 1
+        },
+        "model": "access.groupuser",
+        "pk": 2
     }
 ]