From 5327cca12e97118bf1793c07155bd7036d4dc6e2 Mon Sep 17 00:00:00 2001
From: Bjarke Madsen <bjarke@nordu.net>
Date: Thu, 15 Jun 2023 19:03:00 +0200
Subject: [PATCH] Move logging and sentry SDK initialization
---
compendium_v2/__init__.py | 12 ++++++++++++
compendium_v2/app.py | 2 --
compendium_v2/environment.py | 13 +------------
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/compendium_v2/__init__.py b/compendium_v2/__init__.py
index de1b313f..dbc2d798 100644
--- a/compendium_v2/__init__.py
+++ b/compendium_v2/__init__.py
@@ -4,6 +4,10 @@ automatically invoked app factory
import logging
import os
+import pkg_resources
+import sentry_sdk
+from sentry_sdk.integrations.flask import FlaskIntegration
+
from flask import Flask
from flask_cors import CORS # for debugging
# the currently available stubs for flask_migrate are old (they depend on sqlalchemy 1.4 types)
@@ -11,6 +15,14 @@ from flask_migrate import Migrate, upgrade # type: ignore
from compendium_v2 import config, environment
from compendium_v2.db import db
+sentry_dsn = os.getenv('SENTRY_DSN')
+if sentry_dsn:
+ sentry_sdk.init(
+ dsn=sentry_dsn,
+ integrations=[FlaskIntegration()],
+ release=pkg_resources.get_distribution('compendium-v2').version)
+
+environment.setup_logging()
def _create_app(app_config) -> Flask:
diff --git a/compendium_v2/app.py b/compendium_v2/app.py
index bc91cd74..76f82b58 100644
--- a/compendium_v2/app.py
+++ b/compendium_v2/app.py
@@ -2,8 +2,6 @@
default app creation
"""
import compendium_v2
-from compendium_v2 import environment
-environment.setup_logging()
app = compendium_v2.create_app()
diff --git a/compendium_v2/environment.py b/compendium_v2/environment.py
index 10078801..fb8e8b7c 100644
--- a/compendium_v2/environment.py
+++ b/compendium_v2/environment.py
@@ -1,10 +1,6 @@
import json
import logging.config
import os
-import pkg_resources
-import sentry_sdk
-from sentry_sdk.integrations.flask import FlaskIntegration
-
LOGGING_DEFAULT_CONFIG = {
'version': 1,
@@ -21,7 +17,7 @@ LOGGING_DEFAULT_CONFIG = {
'level': 'DEBUG',
'formatter': 'simple',
'stream': 'ext://sys.stdout'
- }
+ },
},
@@ -53,11 +49,4 @@ def setup_logging():
with open(filename) as f:
logging_config = json.loads(f.read())
- sentry_dsn = os.getenv('SENTRY_DSN')
- if sentry_dsn:
- sentry_sdk.init(
- dsn=sentry_dsn,
- integrations=[FlaskIntegration()],
- release=pkg_resources.get_distribution('compendium-v2').version)
-
logging.config.dictConfig(logging_config)
--
GitLab