From 84097b2d92778807288d6b70f49d5d192942b0a0 Mon Sep 17 00:00:00 2001 From: Mark Date: Thu, 25 Jul 2024 00:22:13 +0200 Subject: [PATCH] Update configHandler.py --- BridgeEmulator/configManager/configHandler.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/BridgeEmulator/configManager/configHandler.py b/BridgeEmulator/configManager/configHandler.py index c2580df5..25404824 100644 --- a/BridgeEmulator/configManager/configHandler.py +++ b/BridgeEmulator/configManager/configHandler.py @@ -2,6 +2,7 @@ from configManager.argumentHandler import parse_arguments from datetime import datetime import os +import pathlib import subprocess import json import logManager @@ -33,6 +34,7 @@ def _write_yaml(path, contents): class Config: yaml_config = None configDir = parse_arguments()["CONFIG_PATH"] + runningDir = pathlib.Path(__file__).parent.resolve() def __init__(self): if not os.path.exists(self.configDir): @@ -293,7 +295,7 @@ def download_config(self): def download_log(self): subprocess.run('tar -cvf ' + self.configDir + '/diyhue_log.tar ' + - '/*.log* ', + self.runningDir + '/*.log* ', shell=True, capture_output=True, text=True) return self.configDir + "/diyhue_log.tar" @@ -314,7 +316,7 @@ def download_debug(self): _write_yaml(self.configDir + "/system_info.yaml", info) subprocess.run('tar --exclude=' + "'config.yaml'" + ' -cvf ' + self.configDir + '/config_debug.tar ' + self.configDir + '/*.yaml ' + - '/*.log* ', + self.runningDir + '/*.log* ', shell=True, capture_output=True, text=True) os.popen('rm -r ' + self.configDir + '/config_debug.yaml') return self.configDir + "/config_debug.tar"