ouczbs/anki-sync-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: Separate loading config from file and environment variables

Browse Source
This commit is contained in:
Vikash Kothary 2022-10-14 23:13:40 +01:00
parent 7bc8496b6f
commit b4a59f7c7c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ankisyncd/__main__.py
View File

@ -2,7 +2,8 @@ import os
import sys import sys
import ankisyncd import ankisyncd
import ankisyncd.config from ankisyncd.config import load_from_file
from ankisyncd.config import load_from_env
from ankisyncd import logging from ankisyncd import logging
from ankisyncd.sync_app import SyncApp from ankisyncd.sync_app import SyncApp
from ankisyncd.server import run_server from ankisyncd.server import run_server
@ -19,7 +20,8 @@ def main():
"ankisyncd {} ({})".format(ankisyncd._get_version(), ankisyncd._homepage) "ankisyncd {} ({})".format(ankisyncd._get_version(), ankisyncd._homepage)
) )
config = ankisyncd.config.load(sys.argv) config = load_from_file(sys.argv)
load_from_env(config)
ankiserver = SyncApp(config) ankiserver = SyncApp(config)
run_server(ankiserver, config["host"], int(config["port"])) run_server(ankiserver, config["host"], int(config["port"]))

3
src/ankisyncd/config.py
View File

@ -26,7 +26,7 @@ def load_from_env(conf):
logger.info("Setting {} from ENV".format(config_key)) logger.info("Setting {} from ENV".format(config_key))
def load(path=None): def load_from_file(path=None):
# backwards compat # backwards compat
if len(path) > 1: if len(path) > 1:
path = path[1] path = path[1]
@ -42,7 +42,6 @@ def load(path=None):
parser.read(path) parser.read(path)
conf = parser["sync_app"] conf = parser["sync_app"]
logger.info("Loaded config from {}".format(path)) logger.info("Loaded config from {}".format(path))
load_from_env(conf)
return conf return conf
except KeyError: except KeyError:
pass pass