Fix #377 when invalid port is supplied and minor updates in logging

Author: dhoomakethu

CHANGELOG.rst

@@ -15,6 +15,7 @@ from pymodbus.client.asynchronous import ModbusTcpClient
 * Fix Binary payload example for endianess.
 * Fix tornado async serial client `TypeError` while processing incoming packet.
 * Fix asyncio examples.
+* Improved logging in Modbus Server .
 * Minor update in factory.py, now server logs prints received request instead of only function code
 ```
 # Now

pymodbus/client/sync.py

@@ -481,13 +481,13 @@ def connect(self):
                                         stopbits=self.stopbits,
                                         baudrate=self.baudrate,
                                         parity=self.parity)
+            if self.method == "rtu":
+                if self._strict:
+                    self.socket.interCharTimeout = self.inter_char_timeout
+                self.last_frame_end = None
         except serial.SerialException as msg:
             _logger.error(msg)
             self.close()
-        if self.method == "rtu":
-            if self._strict:
-                self.socket.interCharTimeout = self.inter_char_timeout
-            self.last_frame_end = None
         return self.socket is not None
 
     def close(self):

pymodbus/datastore/context.py

@@ -60,7 +60,8 @@ def validate(self, fx, address, count=1):
         '''
         if not self.zero_mode:
             address = address + 1
-        _logger.debug("validate[%d] %d:%d" % (fx, address, count))
+        _logger.debug("validate: fc-[%d] address-%d: count-%d" % (fx, address,
+                                                                  count))
         return self.store[self.decode(fx)].validate(address, count)
 
     def getValues(self, fx, address, count=1):
@@ -73,7 +74,8 @@ def getValues(self, fx, address, count=1):
         '''
         if not self.zero_mode:
             address = address + 1
-        _logger.debug("getValues[%d] %d:%d" % (fx, address, count))
+        _logger.debug("getValues fc-[%d] address-%d: count-%d" % (fx, address,
+                                                                  count))
         return self.store[self.decode(fx)].getValues(address, count)
 
     def setValues(self, fx, address, values):

pymodbus/server/sync.py

@@ -125,7 +125,7 @@ def send(self, message):
             # self.server.control.Counter.BusMessage += 1
             pdu = self.framer.buildPacket(message)
             if _logger.isEnabledFor(logging.DEBUG):
-                _logger.debug('send: %s' % b2a_hex(pdu))
+                _logger.debug('send: [%s]- %s' % (message, b2a_hex(pdu)))
             return self.request.send(pdu)
 
 
@@ -203,7 +203,7 @@ def send(self, message):
             # self.server.control.Counter.BusMessage += 1
             pdu = self.framer.buildPacket(message)
             if _logger.isEnabledFor(logging.DEBUG):
-                _logger.debug('send: %s' % b2a_hex(pdu))
+                _logger.debug('send: [%s]- %s' % (message, b2a_hex(pdu)))
             return self.request.send(pdu)
 
 
@@ -226,6 +226,7 @@ def handle(self):
                 data, self.socket = self.request
                 if not data:
                     self.running = False
+                    data = b''
                 if _logger.isEnabledFor(logging.DEBUG):
                     _logger.debug('Handling data: ' + hexlify_packets(data))
                 # if not self.server.control.ListenOnly:
@@ -258,7 +259,7 @@ def send(self, message):
             #self.server.control.Counter.BusMessage += 1
             pdu = self.framer.buildPacket(message)
             if _logger.isEnabledFor(logging.DEBUG):
-                _logger.debug('send: %s' % b2a_hex(pdu))
+                _logger.debug('send: [%s]- %s' % (message, b2a_hex(pdu)))
             return self.socket.sendto(pdu, self.client_address)
 
 

pymodbus/version.py

@@ -41,7 +41,7 @@ def __str__(self):
         return '[%s, version %s]' % (self.package, self.short())
 
 
-version = Version('pymodbus', 2, 2, 0, "rc1")
+version = Version('pymodbus', 2, 2, 0, "rc2")
 
 
 version.__name__ = 'pymodbus'  # fix epydoc error