From abbc3a9aac22427a50c45adddf4307bab6d8a3ef Mon Sep 17 00:00:00 2001 From: pmikus Date: Fri, 11 Nov 2022 11:57:26 +0100 Subject: feat(cdash): Environement fixes Signed-off-by: pmikus Change-Id: I6bdb30c7313b909fe29e10b20bd21957433bda87 --- csit.infra.dash/app/.ebextensions/env-flask.config | 4 ++++ csit.infra.dash/app/cdash/__init__.py | 3 +-- csit.infra.dash/app/config.py | 10 ++++++---- csit.infra.dash/app/wsgi.py | 1 - 4 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 csit.infra.dash/app/.ebextensions/env-flask.config (limited to 'csit.infra.dash/app') diff --git a/csit.infra.dash/app/.ebextensions/env-flask.config b/csit.infra.dash/app/.ebextensions/env-flask.config new file mode 100644 index 0000000000..f7ae7c500c --- /dev/null +++ b/csit.infra.dash/app/.ebextensions/env-flask.config @@ -0,0 +1,4 @@ +option_settings: + aws:elasticbeanstalk:application:environment: + FLASK_DEBUG: 0 + FLASK_ENV: production \ No newline at end of file diff --git a/csit.infra.dash/app/cdash/__init__.py b/csit.infra.dash/app/cdash/__init__.py index 20023ec157..b315950d5b 100644 --- a/csit.infra.dash/app/cdash/__init__.py +++ b/csit.infra.dash/app/cdash/__init__.py @@ -31,9 +31,8 @@ def init_app(): level=C.LOG_LEVEL ) - logging.info("Application started.") - app = Flask(__name__, instance_relative_config=False) + app.logger.info("Application started.") app.config.from_object("config.Config") with app.app_context(): diff --git a/csit.infra.dash/app/config.py b/csit.infra.dash/app/config.py index 559864bebb..ae8e83c9e4 100644 --- a/csit.infra.dash/app/config.py +++ b/csit.infra.dash/app/config.py @@ -13,18 +13,20 @@ # See the License for the specific language governing permissions and # limitations under the License. +from os import environ + class Config: """Flask configuration variables. """ # General Config FLASK_APP = "wsgi.py" - FLASK_ENV = "production" + FLASK_ENV = environ.get("FLASK_ENV", "production") # Assets - ASSETS_DEBUG = False - ASSETS_AUTO_BUILD = True + ASSETS_DEBUG = environ.get("ASSETS_DEBUG", False) + ASSETS_AUTO_BUILD = environ.get("ASSETS_AUTO_BUILD", True) # Static Assets STATIC_FOLDER = "static" TEMPLATES_FOLDER = "templates" - COMPRESSOR_DEBUG = "True" + COMPRESSOR_DEBUG = environ.get("COMPRESSOR_DEBUG", False) diff --git a/csit.infra.dash/app/wsgi.py b/csit.infra.dash/app/wsgi.py index 101b6e25ac..3eb1d23181 100644 --- a/csit.infra.dash/app/wsgi.py +++ b/csit.infra.dash/app/wsgi.py @@ -17,5 +17,4 @@ from cdash import app if __name__ == "__main__": # Main entry point. - app.debug = True app.run(host="0.0.0.0") -- cgit 1.2.3-korg