Fix TCP REPL server and support multiple unit id's

Author: dhoomakethu

pymodbus/repl/server/main.py

@@ -57,7 +57,8 @@ def server(ctx, host, web_port, broadcast_support, repl, verbose):
                                 case_sensitive=False),
               help="Modbus framer to use")
 @click.option("--modbus-port", default="5020", help="Modbus port")
-@click.option("--modbus-unit-id", default=[1], multiple=True, help="Modbus unit id")
+@click.option("--modbus-unit-id", default=[1], type=int,
+              multiple=True, help="Modbus unit id")
 @click.option("--modbus-config", type=click.Path(exists=True),
               help="Path to additional modbus server config")
 @click.option("-r", "--randomize", default=0, help="Randomize every `r` reads."

pymodbus/server/reactive/main.py

@@ -135,18 +135,19 @@ async def start_modbus_server(self, app):
         :return:
         """
         try:
-            if isinstance(self._modbus_server, ModbusSerialServer):
-                if hasattr(asyncio, "create_task"):
+            if hasattr(asyncio, "create_task"):
+                if isinstance(self._modbus_server, ModbusSerialServer):
                     app["modbus_serial_server"] = asyncio.create_task(
                         self._modbus_server.start())
-                    app["modbus_server"] = asyncio.create_task(
-                        self._modbus_server.serve_forever())
-                else:
+                app["modbus_server"] = asyncio.create_task(
+                    self._modbus_server.serve_forever())
+            else:
+                if isinstance(self._modbus_server, ModbusSerialServer):
                     app["modbus_serial_server"] = asyncio.ensure_future(
                         self._modbus_server.start()
                     )
-                    app["modbus_server"] = asyncio.ensure_future(
-                        self._modbus_server.serve_forever())
+                app["modbus_server"] = asyncio.ensure_future(
+                    self._modbus_server.serve_forever())
 
             logger.info("Modbus server started")
         except Exception as e: