From 0c1a1206ebf12cd23498ffe018b2b648c7610494 Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@esss.se>
Date: Thu, 11 Oct 2018 16:09:31 +0200
Subject: [PATCH] Sort settings displayed by key
JIRA INFRA-576
---
app/factory.py | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/app/factory.py b/app/factory.py
index 060d692..576b59b 100644
--- a/app/factory.py
+++ b/app/factory.py
@@ -84,8 +84,8 @@ def create_app(config=None):
app.logger.addHandler(handler)
app.logger.info("CSEntry created!")
# Remove variables that contain a password
- settings_to_display = [
- f"{key}: {value}"
+ settings_to_display = {
+ key: value
for key, value in app.config.items()
if key
not in (
@@ -94,12 +94,14 @@ def create_app(config=None):
"LDAP_BIND_USER_PASSWORD",
"SQLALCHEMY_DATABASE_URI",
)
- ]
+ }
# The repr() of make_url hides the password
- settings_to_display.append(
- f'SQLALCHEMY_DATABASE_URI: {sa.engine.url.make_url(app.config["SQLALCHEMY_DATABASE_URI"])!r}'
+ settings_to_display["SQLALCHEMY_DATABASE_URI"] = repr(
+ sa.engine.url.make_url(app.config["SQLALCHEMY_DATABASE_URI"])
+ )
+ settings_string = "\n".join(
+ [f"{key}: {settings_to_display[key]}" for key in sorted(settings_to_display)]
)
- settings_string = "\n".join(settings_to_display)
app.logger.info(f"Settings:\n{settings_string}")
db.init_app(app)
--
GitLab