Skip to content

Commit

Permalink
Merge pull request #71 from unicef/remove-crashlog
Browse files Browse the repository at this point in the history
Remove crashlog
  • Loading branch information
domdinicola authored Jan 8, 2021
2 parents 60b84e1 + 4ffabce commit 99ffe6f
Show file tree
Hide file tree
Showing 14 changed files with 52 additions and 83 deletions.
1 change: 0 additions & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ django-concurrency = "==2.1.1"
django-constance = "==2.6.0"
django-cors-headers = "==3.2.1"
django-countries = "==6.1.2"
django-crashlog = "==1.0.0"
django-crispy-forms = "==1.9.0"
django-model-utils = "==4.0.0"
django-mptt = "==0.11.0"
Expand Down
99 changes: 46 additions & 53 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ services:
datamart:
container_name: datamart
<< : *datamart_defaults
command: bash -c "python /code/manage.py migrate && python /code/manage.py runserver 0.0.0.0:8080"
command: bash -c "python /code/manage.py init-setup --migrate && python /code/manage.py runserver 0.0.0.0:8080"
labels:
- "traefik.http.routers.datamart.rule=PathPrefix(`/`)"
- traefik.http.routers.datamart.service=datamart
Expand Down
3 changes: 1 addition & 2 deletions src/etools_datamart/config/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@
'django.contrib.auth.middleware.AuthenticationMiddleware',
'impersonate.middleware.ImpersonateMiddleware',
# 'django.contrib.auth.middleware.RemoteUserMiddleware',
'crashlog.middleware.CrashLogMiddleware',
'unicef_rest_framework.middleware.ApiMiddleware',
# 'etools_datamart.apps.tracking.middleware.ThreadedStatsMiddleware',
'etools_datamart.apps.tracking.middleware.StatsMiddleware',
Expand Down Expand Up @@ -459,7 +458,7 @@
CELERY_TIMEZONE = 'America/New_York'
CELERY_EMAIL_BACKEND = env.str(
'CELERY_EMAIL_BACKEND',
default='django.core.mail.backends.smtp.EmailBackend',
default='post_office.backends.EmailBackend',
)
CELERY_EMAIL_CHUNK_SIZE = 10

Expand Down
2 changes: 0 additions & 2 deletions src/unicef_rest_framework/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from django.utils.translation import ugettext as _

from constance import config
from crashlog.middleware import process_exception
from rest_framework import exceptions
from rest_framework.authentication import BaseAuthentication
from rest_framework.exceptions import AuthenticationFailed, PermissionDenied
Expand Down Expand Up @@ -104,7 +103,6 @@ def authenticate_credentials(self, payload):
user, created = User.objects.update_or_create(**pk,
defaults=values)
except Exception as e:
process_exception(e)
raise exceptions.AuthenticationFailed("Unable to retrieve user data")
else:
user, created = User.objects.update_or_create(username=username,
Expand Down
2 changes: 0 additions & 2 deletions src/unicef_rest_framework/models/preload.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from django.db import models
from django.utils import timezone

from crashlog.middleware import process_exception
from rest_framework.test import APIClient, ForceAuthClientHandler

from unicef_security.models import User
Expand Down Expand Up @@ -106,7 +105,6 @@ def run(self, *, target=None, params=None, pre_save=None):
pre_save(self, response)
return response
except Exception as e:
process_exception(e)
self.status_code = 501
self.etag = ""
self.response_ms = 0
Expand Down
2 changes: 0 additions & 2 deletions src/unicef_rest_framework/renderers/csv.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import logging

from crashlog.middleware import process_exception
from rest_framework_csv import renderers as r

from unicef_rest_framework.renderers.mixin import ContentDispositionMixin
Expand All @@ -20,6 +19,5 @@ def render(self, data, media_type=None, renderer_context=None, writer_opts=None)
data = dict(data)['results']
return super().render(data, media_type, renderer_context, writer_opts)
except Exception as e:
process_exception(e)
logger.exception(e)
raise Exception('Error processing request')
2 changes: 0 additions & 2 deletions src/unicef_rest_framework/renderers/html.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

from django.template import loader

from crashlog.middleware import process_exception
from rest_framework.renderers import BaseRenderer

logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -46,6 +45,5 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
'headers': []}
return template.render(c)
except Exception as e:
process_exception(e)
logger.exception(e)
raise Exception('Error processing request') from e
2 changes: 0 additions & 2 deletions src/unicef_rest_framework/renderers/iqy.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from django.conf import settings
from django.template import loader

from crashlog.middleware import process_exception
from rest_framework.renderers import BaseRenderer

from unicef_rest_framework.renderers.mixin import ContentDispositionMixin
Expand Down Expand Up @@ -51,6 +50,5 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
template = self.get_template(opts)
return template.render(c)
except Exception as e:
process_exception(e)
logger.exception(e)
raise Exception('Error processing request %s' % e) from e
2 changes: 0 additions & 2 deletions src/unicef_rest_framework/renderers/pdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from django.conf import settings
from django.template import loader

from crashlog.middleware import process_exception
from xhtml2pdf import pisa

from unicef_rest_framework.renderers.mixin import ContentDispositionMixin
Expand Down Expand Up @@ -72,6 +71,5 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
buffer.seek(0)
return buffer.read()
except Exception as e:
process_exception(e)
logger.exception(e)
raise Exception('Error processing request') from e
2 changes: 0 additions & 2 deletions src/unicef_rest_framework/renderers/txt.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

from django.template import loader

from crashlog.middleware import process_exception
from rest_framework.renderers import BaseRenderer

logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -46,6 +45,5 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
'headers': []}
return template.render(c)
except Exception as e:
process_exception(e)
logger.exception(e)
raise Exception('Error processing request') from e
2 changes: 0 additions & 2 deletions src/unicef_rest_framework/renderers/xls.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import logging
from collections import Iterable, MutableMapping

from crashlog.middleware import process_exception
from drf_renderer_xlsx.renderers import XLSXRenderer as _XLSXRenderer

from unicef_rest_framework.renderers.mixin import ContentDispositionMixin
Expand Down Expand Up @@ -40,6 +39,5 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
return super().render(data, accepted_media_type, renderer_context)

except Exception as e:
process_exception(e)
logger.exception(e)
raise Exception(f'Error processing request {e}') from e
2 changes: 0 additions & 2 deletions src/unicef_rest_framework/renderers/yaml.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import logging

from crashlog.middleware import process_exception
from rest_framework_yaml.renderers import YAMLRenderer as BaseRenderer

from unicef_rest_framework.renderers.mixin import ContentDispositionMixin
Expand All @@ -24,6 +23,5 @@ def render(self, data, accepted_media_type=None, renderer_context=None):
return super().render(data, accepted_media_type, renderer_context)

except Exception as e:
process_exception(e)
logger.exception(e)
raise Exception(f'Error processing request {e}') from e
12 changes: 4 additions & 8 deletions src/unicef_security/graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

import requests
from constance import config as constance
from crashlog.middleware import process_exception
from jwt import decode as jwt_decode, DecodeError, ExpiredSignature
from social_core.backends.azuread_tenant import AzureADTenantOAuth2
from social_core.exceptions import AuthTokenError
Expand Down Expand Up @@ -103,15 +102,12 @@ def get_unicef_user(backend, details, response, *args, **kwargs):
for k, v in response.items():
if k in ['email', 'family_name', 'unique_name']:
details[k] = v
try:
sync = Synchronizer()
data = sync.get_user(details['email'])

for k, v in data.items():
details[k] = v
sync = Synchronizer()
data = sync.get_user(details['email'])

except Exception as e:
process_exception(e)
for k, v in data.items():
details[k] = v

user, created = User.objects.get_or_create(
username=details['unique_name'],
Expand Down

0 comments on commit 99ffe6f

Please sign in to comment.