OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Warn if we encounter unexpected files in config directories

pull/249/head
Erik Johnston 2015-08-25 17:08:23 +01:00
parent bfb66773a4
commit 3e1029fe80
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
synapse/config/_base.py
View File

@ -159,13 +159,23 @@ class Config(object):
# We accept specifying directories as config paths, we search # We accept specifying directories as config paths, we search
# inside that directory for all files matching *.yaml, and then # inside that directory for all files matching *.yaml, and then
# we apply them in *sorted* order. # we apply them in *sorted* order.
config_files.extend(sorted( files = []
os.path.join(config_path, entry) for entry in os.listdir(config_path):
for entry in os.listdir(config_path) entry_path = os.path.join(config_path, entry)
if entry.endswith(".yaml") and os.path.isfile( if not os.path.isfile(entry_path):
os.path.join(config_path, entry) print (
) "Found subdirectory in config directory: %r. IGNORING."
)) ) % (entry_path, )
continue
if not entry.endswith(".yaml"):
print (
"Found file in config directory that does not"
" end in '.yaml': %r. IGNORING."
) % (entry_path, )
continue
config_files.extend(sorted(files))
else: else:
config_files.append(config_path) config_files.append(config_path)