From 2f24722ead8b6f966fa2800ac6db331d082b4455 Mon Sep 17 00:00:00 2001 From: jbouwh Date: Wed, 27 Oct 2021 13:41:47 +0000 Subject: [PATCH 1/2] Bug fix 2 - v1.4.1 --- omnikloggerproxy.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/omnikloggerproxy.py b/omnikloggerproxy.py index 36f4ce8..7978d5d 100755 --- a/omnikloggerproxy.py +++ b/omnikloggerproxy.py @@ -26,7 +26,7 @@ import datetime import time -__version__ = '1.4.0' +__version__ = '1.4.1' listenaddress = b'127.0.0.1' # Default listenaddress listenport = 10004 # Make sure your firewall enables you listening at this port # There is no need to change this if this proxy must log your data directly to the Omnik/SolarmanPV servers @@ -385,11 +385,11 @@ def get_yaml_setting(settings, section, key, default): home = os.path.expanduser('~') parser = argparse.ArgumentParser() - parser.add_argument('--settings', default=os.path.join(home, '.omnik/config.yaml'), + parser.add_argument('--config', default=os.path.join(home, '.omnik/config.yaml'), help='Path to .yaml configuration file', metavar="FILE") parser.add_argument('--section', default=None, help='Section to .yaml configuration file to use. Defaults to the first section found.') - parser.add_argument('--config', default=os.path.join(home, '.omnik/config.ini'), + parser.add_argument('--settings', default=os.path.join(home, '.omnik/config.ini'), help='Path to configuration file (ini) (DECREPATED!)', metavar="FILE") parser.add_argument('--serialnumber', default=None, nargs='+', help='The serial number(s) of your inverter (required)') From 89f2585e1a73100dff7622a03fe701e53e3891be Mon Sep 17 00:00:00 2001 From: jbouwh Date: Wed, 27 Oct 2021 13:44:35 +0000 Subject: [PATCH 2/2] dont fix what aint broken --- Dockerfile | 2 +- README.md | 4 ++-- omnikloggerproxy.py | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7223970..10d7b71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,4 +23,4 @@ EXPOSE 10004 ENTRYPOINT ["omnikloggerproxy.py"] -CMD ["--config", "/config.yaml", "--settings", "/config.ini"] +CMD ["--settings", "/config.yaml", "--config", "/config.ini"] diff --git a/README.md b/README.md index a07653c..a9b64eb 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,9 @@ The supporting files are installed at the folder */usr/local/share/omnikdatalogg ### Command line ``` usage: omnikloggerproxy.py [-h] --serialnumber SERIALNUMBER [SERIALNUMBER ...] - [--config FILE Path to .yaml configuration file] + [--settings FILE Path to .yaml configuration file] [--section Section to .yaml configuration file to use. Defaults to the first section found.] - [--settings FILE Path to configuration file (ini) (DECREPATED!)] + [--config FILE Path to configuration file (ini) (DECREPATED!)] [--loglevel LOGLEVEL] [--listenaddress LISTENADDRESS] [--listenport LISTENPORT] diff --git a/omnikloggerproxy.py b/omnikloggerproxy.py index 7978d5d..d580b63 100755 --- a/omnikloggerproxy.py +++ b/omnikloggerproxy.py @@ -385,11 +385,11 @@ def get_yaml_setting(settings, section, key, default): home = os.path.expanduser('~') parser = argparse.ArgumentParser() - parser.add_argument('--config', default=os.path.join(home, '.omnik/config.yaml'), + parser.add_argument('--settings', default=os.path.join(home, '.omnik/config.yaml'), help='Path to .yaml configuration file', metavar="FILE") parser.add_argument('--section', default=None, help='Section to .yaml configuration file to use. Defaults to the first section found.') - parser.add_argument('--settings', default=os.path.join(home, '.omnik/config.ini'), + parser.add_argument('--config', default=os.path.join(home, '.omnik/config.ini'), help='Path to configuration file (ini) (DECREPATED!)', metavar="FILE") parser.add_argument('--serialnumber', default=None, nargs='+', help='The serial number(s) of your inverter (required)') @@ -437,7 +437,7 @@ def get_yaml_setting(settings, section, key, default): "CRITICAL": logging.CRITICAL } - if os.path.isfile(args.config): + if os.path.isfile(args.settings): settings = get_yaml_settings(args) args.mqtt_host = get_yaml_setting(settings, 'output.mqtt', 'host', args.mqtt_host) args.mqtt_port = get_yaml_setting(settings, 'output.mqtt', 'port', args.mqtt_port) @@ -461,7 +461,7 @@ def get_yaml_setting(settings, section, key, default): args.listenport = get_yaml_setting(settings, 'proxy', 'listenport', args.listenport) args.omniklogger = get_yaml_setting(settings, 'proxy', 'omniklogger', args.omniklogger) args.omnikloggerport = get_yaml_setting(settings, 'proxy', 'omnikloggerport', args.omnikloggerport) - elif os.path.isfile(args.settings): + elif os.path.isfile(args.config): c = configparser.ConfigParser(converters={'list': lambda x: [i.strip() for i in x.split(',')]}) c.read([args.config], encoding='utf-8') args.mqtt_host = c.get('output.mqtt', 'host', fallback=args.mqtt_host)