Merge branch 'dev-0.12' of https://github.com/s-allius/tsun-gen3-proxy into dev-0.12

app/src/cnf/config.py

@@ -189,6 +189,7 @@ here. The default config reader is handled in the Config.init method'''
             cls.err = f'error: {error}'
             logging.error(
                 f"Can't read from {reader.descr()} => error\n  {error}")
+            return cls.err
 
         logging.info(f'Read from {reader.descr()} => {res}')
         return cls.err

app/src/cnf/config_read_env.py

@@ -22,4 +22,4 @@ class ConfigReadEnv(ConfigIfc):
         return conf
 
     def descr(self):
-        return "Read environment"
+        return "environment"

app/src/inverter_base.py

@@ -6,6 +6,7 @@ import json
 import gc
 from aiomqtt import MqttCodeError
 from asyncio import StreamReader, StreamWriter
+from ipaddress import ip_address
 
 from inverter_ifc import InverterIfc
 from proxy import Proxy
@@ -101,6 +102,20 @@ class InverterBase(InverterIfc, Proxy):
             logging.info(f'[{stream.node_id}] Connect to {addr}')
             connect = asyncio.open_connection(host, port)
             reader, writer = await connect
+            r_addr = writer.get_extra_info('peername')
+            if r_addr is not None:
+                (ip, _) = r_addr
+                if ip_address(ip).is_private:
+                    logging.error(
+                        f"""resolve {host} to {ip}, which is a private IP!
+\u001B[31m  Check your DNS settings and use a public DNS resolver!
+
+  To prevent a possible loop, forwarding to local IP addresses is
+  not supported and is deactivated for subsequent connections
+\u001B[0m
+""")
+                    Config.act_config[self.config_id]['enabled'] = False
+
             ifc = AsyncStreamClient(
                 reader, writer, self.local, self.__del_remote)
 

app/src/modbus_tcp.py

@@ -49,7 +49,7 @@ class ModbusTcp():
                and 'monitor_sn' in inv
                and 'client_mode' in inv):
                 client = inv['client_mode']
-                # logging.info(f"SerialNo:{inv['monitor_sn']} host:{client['host']} port:{client['port']}")  # noqa: E501
+                logger.info(f"'client_mode' for snr: {inv['monitor_sn']} host: {client['host']}:{client['port']}, forward: {client['forward']}")  # noqa: E501
                 loop.create_task(self.modbus_loop(client['host'],
                                                   client['port'],
                                                   inv['monitor_sn'],

app/src/server.py

@@ -142,7 +142,7 @@ def main():   # pragma: no cover
     parser.add_argument('-t', '--toml_config', type=str,
                         help='read user config from toml-file')
     parser.add_argument('-l', '--log_path', type=str,
-                        default='log/',
+                        default='./log/',
                         help='set path for the logging files')
     parser.add_argument('-b', '--log_backups', type=int,
                         default=0,
@@ -159,11 +159,15 @@ def main():   # pragma: no cover
 
     logging.config.fileConfig('logging.ini')
     logging.info(f'Server "{serv_name} - {version}" will be started')
+    logging.info(f'current dir: {os.getcwd()}')
     logging.info(f"config_path: {args.config_path}")
     logging.info(f"json_config: {args.json_config}")
     logging.info(f"toml_config: {args.toml_config}")
     logging.info(f"log_path:    {args.log_path}")
-    logging.info(f"log_backups: {args.log_backups} days")
+    if args.log_backups == 0:
+        logging.info("log_backups: unlimited")
+    else:
+        logging.info(f"log_backups: {args.log_backups} days")
     log_level = get_log_level()
     logging.info('******')
 
@@ -204,6 +208,7 @@ def main():   # pragma: no cover
     # and we can't receive and handle the UNIX signals!
     #
     for inv_class, port in [(InverterG3, 5005), (InverterG3P, 10000)]:
+        logging.info(f'listen on port: {port} for inverters')
         loop.create_task(asyncio.start_server(lambda r, w, i=inv_class:
                                               handle_client(r, w, i),
                                               '0.0.0.0', port))