Skip to content
Snippets Groups Projects
Commit 5327cca1 authored by Bjarke Madsen's avatar Bjarke Madsen
Browse files

Move logging and sentry SDK initialization

parent 2781f336
No related branches found
No related tags found
1 merge request!44Feature/comp 208 google o auth poc
...@@ -4,6 +4,10 @@ automatically invoked app factory ...@@ -4,6 +4,10 @@ automatically invoked app factory
import logging import logging
import os import os
import pkg_resources
import sentry_sdk
from sentry_sdk.integrations.flask import FlaskIntegration
from flask import Flask from flask import Flask
from flask_cors import CORS # for debugging from flask_cors import CORS # for debugging
# the currently available stubs for flask_migrate are old (they depend on sqlalchemy 1.4 types) # 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 ...@@ -11,6 +15,14 @@ from flask_migrate import Migrate, upgrade # type: ignore
from compendium_v2 import config, environment from compendium_v2 import config, environment
from compendium_v2.db import db 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: def _create_app(app_config) -> Flask:
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
default app creation default app creation
""" """
import compendium_v2 import compendium_v2
from compendium_v2 import environment
environment.setup_logging()
app = compendium_v2.create_app() app = compendium_v2.create_app()
......
import json import json
import logging.config import logging.config
import os import os
import pkg_resources
import sentry_sdk
from sentry_sdk.integrations.flask import FlaskIntegration
LOGGING_DEFAULT_CONFIG = { LOGGING_DEFAULT_CONFIG = {
'version': 1, 'version': 1,
...@@ -21,7 +17,7 @@ LOGGING_DEFAULT_CONFIG = { ...@@ -21,7 +17,7 @@ LOGGING_DEFAULT_CONFIG = {
'level': 'DEBUG', 'level': 'DEBUG',
'formatter': 'simple', 'formatter': 'simple',
'stream': 'ext://sys.stdout' 'stream': 'ext://sys.stdout'
} },
}, },
...@@ -53,11 +49,4 @@ def setup_logging(): ...@@ -53,11 +49,4 @@ def setup_logging():
with open(filename) as f: with open(filename) as f:
logging_config = json.loads(f.read()) 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) logging.config.dictConfig(logging_config)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment