From 8d3c0ec0106ac8cb779cd71cb55b7a8ff029b65d Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Fri, 8 Feb 2019 06:58:08 +0300 Subject: powerful configuration management --- kvmd/apps/cleanup/__init__.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'kvmd/apps/cleanup') diff --git a/kvmd/apps/cleanup/__init__.py b/kvmd/apps/cleanup/__init__.py index 01dfe703..39ee071e 100644 --- a/kvmd/apps/cleanup/__init__.py +++ b/kvmd/apps/cleanup/__init__.py @@ -10,25 +10,25 @@ from ... import gpio # ===== def main() -> None: - config = init()["kvmd"] + config = init()[2].kvmd logger = get_logger(0) logger.info("Cleaning up ...") with gpio.bcm(): for (name, pin) in [ - ("hid_reset", config["hid"]["pinout"]["reset"]), - ("msd_target", config["msd"]["pinout"]["target"]), - ("msd_reset", config["msd"]["pinout"]["reset"]), - ("atx_power_switch", config["atx"]["pinout"]["power_switch"]), - ("atx_reset_switch", config["atx"]["pinout"]["reset_switch"]), - ("streamer_cap", config["streamer"]["pinout"].get("cap", -1)), - ("streamer_conv", config["streamer"]["pinout"].get("conv", -1)), + ("hid_reset", config.hid.pinout.reset), + ("msd_target", config.hid.pinout.target), + ("msd_reset", config.msd.pinout.reset), + ("atx_power_switch", config.atx.pinout.power_switch), + ("atx_reset_switch", config.atx.pinout.reset_switch), + ("streamer_cap", config.streamer.pinout.cap), + ("streamer_conv", config.streamer.pinout.conv), ]: if pin > 0: logger.info("Writing value=0 to pin=%d (%s)", pin, name) gpio.set_output(pin, initial=False) - streamer = os.path.basename(config["streamer"]["cmd"][0]) + streamer = os.path.basename(config.streamer.cmd[0]) logger.info("Trying to find and kill %r ...", streamer) try: subprocess.check_output(["killall", streamer], stderr=subprocess.STDOUT) @@ -37,7 +37,7 @@ def main() -> None: except subprocess.CalledProcessError: pass - unix_path = config["server"].get("unix", "") + unix_path = config.server.unix if unix_path and os.path.exists(unix_path): logger.info("Removing socket %r ...", unix_path) os.remove(unix_path) -- cgit v1.2.3