Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-10-01 11:49:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve logging when generating config files (#5510)

Browse Source 
Make it a bit clearer what's going on.
This commit is contained in:
Richard van der Hoff 2019-06-21 17:14:56 +01:00 committed by GitHub
parent 5d6644efe0
commit 37933a3bf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5510.misc Normal file
View File

@ -0,0 +1 @@
Improve logging when generating config files.

3
synapse/config/_base.py
View File

@ -289,6 +289,7 @@ class Config(object):
) )
(config_path,) = config_files (config_path,) = config_files
if not cls.path_exists(config_path): if not cls.path_exists(config_path):
print("Generating config file %s" % (config_path,))
if config_args.keys_directory: if config_args.keys_directory:
config_dir_path = config_args.keys_directory config_dir_path = config_args.keys_directory
else: else:
@ -331,7 +332,7 @@ class Config(object):
else: else:
print( print(
( (
"Config file %r already exists. Generating any missing key" "Config file %r already exists. Generating any missing config"
" files." " files."
) )
% (config_path,) % (config_path,)

1
synapse/config/key.py
View File

@ -241,6 +241,7 @@ class KeyConfig(Config):
signing_key_path = config["signing_key_path"] signing_key_path = config["signing_key_path"]
if not self.path_exists(signing_key_path): if not self.path_exists(signing_key_path):
print("Generating signing key file %s" % (signing_key_path,))
with open(signing_key_path, "w") as signing_key_file: with open(signing_key_path, "w") as signing_key_file:
key_id = "a_" + random_string(4) key_id = "a_" + random_string(4)
write_signing_keys(signing_key_file, (generate_signing_key(key_id),)) write_signing_keys(signing_key_file, (generate_signing_key(key_id),))

4
synapse/config/logger.py
View File

@ -137,6 +137,10 @@ class LoggingConfig(Config):
log_config = config.get("log_config") log_config = config.get("log_config")
if log_config and not os.path.exists(log_config): if log_config and not os.path.exists(log_config):
log_file = self.abspath("homeserver.log") log_file = self.abspath("homeserver.log")
print(
"Generating log config file %s which will log to %s"
% (log_config, log_file)
)
with open(log_config, "w") as log_config_file: with open(log_config, "w") as log_config_file:
log_config_file.write(DEFAULT_LOG_CONFIG.substitute(log_file=log_file)) log_config_file.write(DEFAULT_LOG_CONFIG.substitute(log_file=log_file))