From 55109e271c0a4434dbc818e03722676b78e693f2 Mon Sep 17 00:00:00 2001 From: Maxime Alves LIRMM Date: Fri, 3 Sep 2021 16:38:20 +0200 Subject: [PATCH] =?UTF-8?q?[conf]=C2=A0fix=20HALFAPI=5FPROD=20variable=20t?= =?UTF-8?q?hat=20is=20set=20to=20a=20string?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- halfapi/app.py | 2 +- halfapi/conf.py | 2 -- halfapi/lib/jwt_middleware.py | 11 ----------- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/halfapi/app.py b/halfapi/app.py index 90c963a..be6deef 100644 --- a/halfapi/app.py +++ b/halfapi/app.py @@ -113,6 +113,6 @@ class HalfAPI: starlette_app=self.application) ) - + logger.info('CONFIG:\n%s', CONFIG) application = HalfAPI().application diff --git a/halfapi/conf.py b/halfapi/conf.py index ebb6a1c..30471e6 100644 --- a/halfapi/conf.py +++ b/halfapi/conf.py @@ -135,8 +135,6 @@ except FileNotFoundError as exc: PRODUCTION = config.getboolean('project', 'production', fallback=environ.get('HALFAPI_PROD', False)) -os.environ['HALFAPI_PROD'] = str(PRODUCTION) - LOGLEVEL = config.get('project', 'loglevel', fallback=environ.get('HALFAPI_LOGLEVEL', 'info')).lower() diff --git a/halfapi/lib/jwt_middleware.py b/halfapi/lib/jwt_middleware.py index 287b381..ae3d107 100644 --- a/halfapi/lib/jwt_middleware.py +++ b/halfapi/lib/jwt_middleware.py @@ -24,17 +24,6 @@ from starlette.exceptions import HTTPException logger = logging.getLogger('halfapi') -""" -@OLD : old way to check production setting, we can simply check app's "debug" attribute - -try: - from ..conf import PRODUCTION -except ImportError: - logger.warning('Could not import PRODUCTION variable from conf module,'\ - ' using HALFAPI_PROD environment variable') - PRODUCTION = bool(environ.get('HALFAPI_PROD', False)) -""" - try: from ..conf import SECRET except ImportError as exc: