diff --git a/compendium_v2/__init__.py b/compendium_v2/__init__.py index de1b313f5fe6f9d47c02339b240c875f978a306e..dbc2d798aad2a8f361ecaca7122d117646dcf723 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 bc91cd745e4346a3b76f7d3927db9194732367a6..76f82b58b2d14b092d3b32706bffa3b6376b03e5 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 1007880149d538a2106a73a14ab818f8e81e0fe0..fb8e8b7cdc575faba73a0685ba5950b3618cf415 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)