kallithea Changeset - 8af15d2789fe

Changeset - 8af15d2789fe

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 6 years ago 2020-01-08 03:11:31
mads@kiilerich.com

Grafted from: 2cd87209c043

py3: avoid logging of b'' strings for "config from db"

1 file changed with 2 insertions and 3 deletions:

kallithea/lib/utils.py

0 comments (0 inline, 0 general)

kallithea/lib/utils.py

➞

Show inline comments

@@ @@ -334,17 +334,16 @@ def make_ui(repo_path=None): @@
     baseui._ucfg = config.config()
     baseui._tcfg = config.config()
     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)
     baseui.setconfig(b'web', b'allow_push', b'*')
     # prevent interactive questions for ssh password / passphrase
     ssh = baseui.config(b'ui', b'ssh', default=b'ssh')

0 comments (0 inline, 0 general)