Merge pull request #343 from webkom/remove_statsd

Remove statsd to make celery great again
webkom · Nov 15, 2016 · 9b3bce8 · 9b3bce8
2 parents c69f3c0 + c1e8a03
commit 9b3bce8
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 30 deletions.
diff --git a/lego/settings/base.py b/lego/settings/base.py
@@ -62,8 +62,6 @@
 ]
 
 MIDDLEWARE_CLASSES = [
-    'django_statsd.middleware.GraphiteRequestTimingMiddleware',
-    'django_statsd.middleware.GraphiteMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',
@@ -136,14 +134,6 @@
 
 CORS_ORIGIN_ALLOW_ALL = True
 
-STATSD_PATCHES = [
-    'django_statsd.patches.db',
-    'django_statsd.patches.cache',
-]
-STATSD_MODEL_SIGNALS = True
-STATSD_CELERY_SIGNALS = True
-STATSD_PREFIX = 'lego'
-
 CHANNEL_LAYERS = {
     'default': {
         'BACKEND': 'asgi_redis.RedisChannelLayer',

diff --git a/lego/settings/celery.py b/lego/settings/celery.py
@@ -26,7 +26,6 @@ def on_configure(self):
 
 app.config_from_object('django.conf:settings', namespace='CELERY')
 app.autodiscover_tasks()
-
 schedule = {}
 
 app.conf.update(

diff --git a/lego/settings/development.py b/lego/settings/development.py
@@ -28,7 +28,6 @@
 
 INTERNAL_IPS = ['127.0.0.1']
 INSTALLED_APPS += [
-    'django_statsd',
     'debug_toolbar',
 ]
 MIDDLEWARE_CLASSES = [
@@ -47,7 +46,6 @@
     'debug_toolbar.panels.signals.SignalsPanel',
     'debug_toolbar.panels.logging.LoggingPanel',
     'debug_toolbar.panels.redirects.RedirectsPanel',
-    'django_statsd.panel.StatsdPanel'
 ]
 
 REST_FRAMEWORK['DEFAULT_RENDERER_CLASSES'] += ['rest_framework.renderers.BrowsableAPIRenderer']
@@ -63,8 +61,6 @@
     },
 }
 
-STATSD_CLIENT = 'django_statsd.clients.toolbar'
-
 ELASTICSEARCH = [
     {'host': '127.0.0.1'},
 ]
diff --git a/lego/settings/logging.py b/lego/settings/logging.py
@@ -22,7 +22,7 @@
     },
     'root': {
         'level': 'DEBUG',
-        'handlers': ['sentry', 'console', 'syslog', 'statsd'],
+        'handlers': ['sentry', 'console', 'syslog'],
     },
     'formatters': {
         'verbose': {
@@ -51,11 +51,6 @@
             'facility': 'local7',
             'formatter': 'syslog',
         },
-        'statsd': {
-            'level': 'CRITICAL',
-            'filters': ['skip_if_testing'],
-            'class': 'django_statsd.loggers.errors.StatsdHandler',
-        },
     },
     'loggers': {
         'celery': {

diff --git a/lego/settings/production.py b/lego/settings/production.py
@@ -62,6 +62,3 @@
 CHANNEL_LAYERS['default']['CONFIG'] = {
     'hosts': [env('CHANNELS_REDIS_URL')]
 }
-
-# Statsd
-STATSD_CLIENT = 'django_statsd.clients.normal'
diff --git a/lego/settings/test.py b/lego/settings/test.py
@@ -37,11 +37,6 @@
 # We don't care about pagination in the tests
 REST_FRAMEWORK['DEFAULT_PAGINATION_CLASS'] = None
 
-STATSD_CLIENT = 'django_statsd.clients.null'
-STATSD_PATCHES = []
-STATSD_MODEL_SIGNALS = False
-STATSD_CELERY_SIGNALS = False
-
 ELASTICSEARCH = [
     {'host': 'localhost'},
 ]

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -9,7 +9,6 @@ raven==5.31.0
 redis==2.10.5
 hiredis==0.2.0
 stream-framework==1.4.0
-git+https://github.com/django-statsd/django-statsd.git#67c8077
 certifi==2016.9.26
 elasticsearch==2.4.0
 asgi_redis==0.14.1