From 577bf534e90d98900eb6133efae15233e2569d73 Mon Sep 17 00:00:00 2001 From: RhodeCode Admin Date: Mon, 12 Dec 2022 22:34:15 +0100 Subject: [PATCH] env: small fixes to sync with vcsserver settings maker --- rhodecode/config/middleware.py | 4 ++-- rhodecode/config/settings_maker.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py index a5aa7b3c..6c8d4478 100644 --- a/rhodecode/config/middleware.py +++ b/rhodecode/config/middleware.py @@ -527,8 +527,8 @@ def sanitize_settings_and_apply_defaults(global_config, settings): # statsd settings_maker.make_setting('statsd.enabled', False, parser='bool') - settings_maker.make_setting('statsd.statsd_host', '0.0.0.0') - settings_maker.make_setting('statsd.statsd_port', 8125, parser='int') + settings_maker.make_setting('statsd.statsd_host', 'statsd-exporter', parser='string') + settings_maker.make_setting('statsd.statsd_port', 9125, parser='int') settings_maker.make_setting('statsd.statsd_prefix', '') settings_maker.make_setting('statsd.statsd_ipv6', False, parser='bool') diff --git a/rhodecode/config/settings_maker.py b/rhodecode/config/settings_maker.py index 10f6e405..87c878f9 100644 --- a/rhodecode/config/settings_maker.py +++ b/rhodecode/config/settings_maker.py @@ -27,7 +27,10 @@ import tempfile import logging.config log = logging.getLogger(__name__) -set_keys = {} +# skip keys, that are set here, so we don't double process those +set_keys = { + '__file__': '' +} def str2bool(_str):