diff --git a/swh/web/gunicorn_config.py b/swh/web/gunicorn_config.py index 9c9a5b5c..7c7358b8 100644 --- a/swh/web/gunicorn_config.py +++ b/swh/web/gunicorn_config.py @@ -1,14 +1,12 @@ -# Copyright (C) 2019 The Software Heritage developers +# Copyright (C) 2019-2020 The Software Heritage developers # See the AUTHORS file at the top-level directory of this distribution # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information from sentry_sdk.integrations.django import DjangoIntegration -from swh.core.api.gunicorn_config import * # noqa -from swh.core.api.gunicorn_config import post_fork as _post_fork +from swh.core.sentry import init_sentry -def post_fork(server, worker): # type: ignore - _post_fork(server, worker, - flask=False, sentry_integrations=[DjangoIntegration()]) +def post_fork(server, worker): + init_sentry(sentry_dsn=None, integrations=[DjangoIntegration()]) diff --git a/swh/web/tests/test_gunicorn_config.py b/swh/web/tests/test_gunicorn_config.py index 89b86f66..dcf3660f 100644 --- a/swh/web/tests/test_gunicorn_config.py +++ b/swh/web/tests/test_gunicorn_config.py @@ -1,51 +1,49 @@ -# Copyright (C) 2019 The Software Heritage developers -# See the AUTHORS file at the top-level directory of this distribution -# License: GNU General Public License version 3, or any later version -# See top-level LICENSE file for more information -# Copyright (C) 2019 The Software Heritage developers +# Copyright (C) 2019-2020 The Software Heritage developers # See the AUTHORS file at the top-level directory of this distribution # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information import os from unittest.mock import patch import swh.web.gunicorn_config as gunicorn_config def test_post_fork_default(): with patch('sentry_sdk.init') as sentry_sdk_init: gunicorn_config.post_fork(None, None) sentry_sdk_init.assert_not_called() def test_post_fork_with_dsn_env(): django_integration = object() # unique object to check for equality with patch('swh.web.gunicorn_config.DjangoIntegration', new=lambda: django_integration): with patch('sentry_sdk.init') as sentry_sdk_init: with patch.dict(os.environ, {'SWH_SENTRY_DSN': 'test_dsn'}): gunicorn_config.post_fork(None, None) sentry_sdk_init.assert_called_once_with( dsn='test_dsn', integrations=[django_integration], debug=False, + release=None, ) def test_post_fork_debug(): django_integration = object() # unique object to check for equality with patch('swh.web.gunicorn_config.DjangoIntegration', new=lambda: django_integration): with patch('sentry_sdk.init') as sentry_sdk_init: with patch.dict(os.environ, {'SWH_SENTRY_DSN': 'test_dsn', 'SWH_SENTRY_DEBUG': '1'}): gunicorn_config.post_fork(None, None) sentry_sdk_init.assert_called_once_with( dsn='test_dsn', integrations=[django_integration], debug=True, + release=None, )