mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-21 12:14:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

Explicitely read yaml for clarity.

Browse source
This commit is contained in:
Jorik Schellekens 2019-08-28 10:08:51 +01:00
parent 48c26d24f5
commit 765d1f13d2
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
synapse/config/__init__.py
View file

@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from ._base import ConfigError, find_config_files, read_config_files
from ._base import ConfigError, find_config_files
# export ConfigError, find_config_files, read_config_files if somebody does
# import *
# this is largely a fudge to stop PEP8 moaning about the import
__all__ = ["ConfigError", "find_config_files", "read_config_files"]
__all__ = ["ConfigError", "find_config_files"]

9
synctl
View file

@ -30,7 +30,7 @@ from six import iteritems
import yaml
from synapse.config import find_config_files, read_config_files
from synapse.config import find_config_files
SYNAPSE = [sys.executable, "-B", "-m", "synapse.app.homeserver"]
@ -179,7 +179,12 @@ def main():
)
sys.exit(1)
config = read_config_files(find_config_files([configfile]))
config_files = find_config_files([configfile])
config = {}
for config_file in config_files:
with open(config_file) as file_stream:
yaml_config = yaml.safe_load(file_stream)
config.update(yaml_config)
pidfile = config["pid_file"]
cache_factor = config.get("synctl_cache_factor")