Merge pull request #3212 from ccnmtl/init-sentry

Update ctlsettings and use init_sentry

footprints/settings_production.py

@@ -1,8 +1,5 @@
-import sys
 from django.conf import settings
-import sentry_sdk
-from sentry_sdk.integrations.django import DjangoIntegration
-from ctlsettings.production import common
+from ctlsettings.production import common, init_sentry
 
 from footprints.settings_shared import * # noqa F403
 
@@ -35,10 +32,5 @@
  pass
 
 
-if ('migrate' not in sys.argv) and \
- ('collectstatic' not in sys.argv) and \
- hasattr(settings, 'SENTRY_DSN'):
- sentry_sdk.init(
- dsn=SENTRY_DSN, # noqa F405
- integrations=[DjangoIntegration()],
- )
+if hasattr(settings, 'SENTRY_DSN'):
+ init_sentry(SENTRY_DSN) # noqa F405

footprints/settings_staging.py

@@ -1,8 +1,5 @@
-import sys
 from django.conf import settings
-import sentry_sdk
-from sentry_sdk.integrations.django import DjangoIntegration
-from ctlsettings.staging import common
+from ctlsettings.staging import common, init_sentry
 
 from footprints.settings_shared import * # noqa F403
 
@@ -33,11 +30,6 @@
 except ImportError:
  pass
 
-if ('migrate' not in sys.argv) and \
- ('collectstatic' not in sys.argv) and \
- hasattr(settings, 'SENTRY_DSN'):
- sentry_sdk.init(
- dsn=SENTRY_DSN, # noqa F405
- integrations=[DjangoIntegration()],
- debug=True,
- )
+
+if hasattr(settings, 'SENTRY_DSN'):
+ init_sentry(SENTRY_DSN) # noqa F405

requirements.txt

@@ -112,7 +112,7 @@ python-dateutil==2.9.0
 requirements/src/edtf-0.9.3ctl-py2.py3-none-any.whl
 
 django-storages==1.14.2
-ctlsettings==0.3.2
+ctlsettings==0.3.4
 funcsigs==1.0.2
 pbr==6.0.0
 django-s3sign<=0.2.1