Mercurial > kallithea

changeset 8107:8af15d2789fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: avoid logging of b'' strings for "config from db"
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 08 Jan 2020 03:11:31 +0100
parents 0088a4b2c84e
children 8c99d5d8eb0e
files kallithea/lib/utils.py
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/lib/utils.py	Wed Jan 08 12:22:58 2020 +0100
+++ b/kallithea/lib/utils.py	Wed Jan 08 03:11:31 2020 +0100
@@ -337,11 +337,10 @@
     sa = meta.Session()
     for ui_ in sa.query(Ui).all():
         if ui_.ui_active:
-            ui_val = b'' if ui_.ui_value is None else safe_bytes(ui_.ui_value)
             log.debug('config from db: [%s] %s=%r', ui_.ui_section,
-                      ui_.ui_key, ui_val)
+                      ui_.ui_key, ui_.ui_value)
             baseui.setconfig(ascii_bytes(ui_.ui_section), ascii_bytes(ui_.ui_key),
-                             ui_val)
+                             b'' if ui_.ui_value is None else safe_bytes(ui_.ui_value))
 
     # force set push_ssl requirement to False, Kallithea handles that
     baseui.setconfig(b'web', b'push_ssl', False)