Skip to content

Commit 676d40d

Browse files
andersktimabbott
authored andcommitted
sentry: Initialize sentry in AppConfig ready hook.
This breaks an import cycle that prevented django-stubs from inferring types for django.conf.settings. Signed-off-by: Anders Kaseorg <anders@zulip.com>
1 parent a5cf3b3 commit 676d40d

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

zerver/apps.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ class ZerverConfig(AppConfig):
1616
name: str = "zerver"
1717

1818
def ready(self) -> None:
19+
if settings.SENTRY_DSN: # nocoverage
20+
from zproject.config import get_config
21+
from zproject.sentry import setup_sentry
22+
23+
setup_sentry(settings.SENTRY_DSN, get_config("machine", "deploy_type", "development"))
24+
1925
# We import zerver.signals here for the side effect of
2026
# registering the user_logged_in signal receiver. This import
2127
# needs to be here (rather than e.g. at top-of-file) to avoid

zproject/computed_settings.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,10 +1224,6 @@ def skip_site_packages_logs(record: logging.LogRecord) -> bool:
12241224

12251225
# Allow the environment to override the default DSN
12261226
SENTRY_DSN = os.environ.get("SENTRY_DSN", SENTRY_DSN)
1227-
if SENTRY_DSN:
1228-
from .sentry import setup_sentry
1229-
1230-
setup_sentry(SENTRY_DSN, get_config("machine", "deploy_type", "development"))
12311227

12321228
SCIM_SERVICE_PROVIDER = {
12331229
"USER_ADAPTER": "zerver.lib.scim.ZulipSCIMUser",

0 commit comments

Comments
 (0)