S allius/issue217 2 (#230)

* add some reader classes to get the configuration

* adapt unittests

* get config from json or toml file

* loop over all config readers to get the configuration

* rename config test files

* use relative paths for coverage test in vscode

* do not throw an error for missing config files

* remove obsolete tests

* use dotted key notation for pv sub dictonary

* log config reading progress

* remove create_config_toml.py

* remove obsolete tests for the ha_addon

* disable mosquitto tests if the server is down

* ignore main method for test coverage

* increase test coverage

* pytest-cov: use relative_files only on github, so coverage will work with vscode locally

* remove unneeded imports

* add missing test cases

* disable branch coverage, cause its not reachable

app/src/server.py

@@ -2,6 +2,7 @@ import logging
 import asyncio
 import signal
 import os
+import argparse
 from asyncio import StreamReader, StreamWriter
 from aiohttp import web
 from logging import config  # noqa F401
@@ -11,7 +12,9 @@ from gen3.inverter_g3 import InverterG3
 from gen3plus.inverter_g3p import InverterG3P
 from scheduler import Schedule
 from cnf.config import Config
-from cnf.config_ifc_proxy import ConfigIfcProxy
+from cnf.config_read_env import ConfigReadEnv
+from cnf.config_read_toml import ConfigReadToml
+from cnf.config_read_json import ConfigReadJson
 from modbus_tcp import ModbusTcp
 
 routes = web.RouteTableDef()
@@ -117,6 +120,8 @@ def get_log_level() -> int:
     '''checks if LOG_LVL is set in the environment and returns the
     corresponding logging.LOG_LEVEL'''
     log_level = os.getenv('LOG_LVL', 'INFO')
+    logging.info(f"LOG_LVL    : {log_level}")
+
     if log_level == 'DEBUG':
         log_level = logging.DEBUG
     elif log_level == 'WARN':
@@ -126,7 +131,17 @@ def get_log_level() -> int:
     return log_level
 
 
-if __name__ == "__main__":
+if __name__ == "__main__":   # pragma: no cover
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-p', '--config_path', type=str,
+                        default='./config/',
+                        help='set path for the configuration files')
+    parser.add_argument('-j', '--json_config', type=str,
+                        help='read user config from json-file')
+    parser.add_argument('-t', '--toml_config', type=str,
+                        help='read user config from toml-file')
+    parser.add_argument('--add_on', action='store_true')
+    args = parser.parse_args()
     #
     # Setup our daily, rotating logger
     #
@@ -135,9 +150,14 @@ if __name__ == "__main__":
 
     logging.config.fileConfig('logging.ini')
     logging.info(f'Server "{serv_name} - {version}" will be started')
+    logging.info(f"AddOn: {args.add_on}")
+    logging.info(f"config_path: {args.config_path}")
+    logging.info(f"json_config: {args.json_config}")
+    logging.info(f"toml_config: {args.toml_config}")
+    log_level = get_log_level()
+    logging.info('******')
 
     # set lowest-severity for 'root', 'msg', 'conn' and 'data' logger
-    log_level = get_log_level()
     logging.getLogger().setLevel(log_level)
     logging.getLogger('msg').setLevel(log_level)
     logging.getLogger('conn').setLevel(log_level)
@@ -150,9 +170,18 @@ if __name__ == "__main__":
     asyncio.set_event_loop(loop)
 
     # read config file
-    ConfigErr = Config.init(ConfigIfcProxy())
+    Config.init(ConfigReadToml("default_config.toml"))
+    ConfigReadEnv()
+    ConfigReadJson(args.config_path + "config.json")
+    ConfigReadToml(args.config_path + "config.toml")
+    ConfigReadJson(args.json_config)
+    ConfigReadToml(args.toml_config)
+    ConfigErr = Config.get_error()
+
     if ConfigErr is not None:
         logging.info(f'ConfigErr: {ConfigErr}')
+    logging.info('******')
+
     Proxy.class_init()
     Schedule.start()
     ModbusTcp(loop)