Skip to content

Commit 018d618

Browse files
committed
Misc updates
1 parent 1564f00 commit 018d618

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

CHANGELOG.rst

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
version 3.0.0dev2
22
----------------------------------------------------------
3+
* Fix mask_write_register call. (#685)
4+
* Add support for byte strings in the device information fields (#693)
5+
* Catch socket going away. (#722)
6+
* Misc typo errors (#718)
37

48
version 3.0.0dev1
59
----------------------------------------------------------

pymodbus/repl/server/cli.py

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
| | \___ | Y Y ( <_> ) /_/ | | \_\ \ | /\___ \ / \ ___/| | \/\ /\ ___/| | \/
2727
|____| / ____|__|_| /\____/\____ | |___ /____//____ > /_______ /\___ >__| \_/ \___ >__|
2828
\/ \/ \/ \/ \/ \/ \/ \/
29+
1.0.0
2930
"""
3031

3132
SMALL_TITLE = "Pymodbus server..."

pymodbus/server/async_io.py

+14-8
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,20 @@ def connection_made(self, transport):
7171
corresponds to the socket being opened
7272
"""
7373
try:
74-
if hasattr(transport, 'get_extra_info') and transport.get_extra_info('sockname') is not None:
75-
_logger.debug("Socket [%s:%s] opened" % transport.get_extra_info('sockname'))
76-
else:
77-
if hasattr(transport, 'serial'):
74+
if hasattr(transport,
75+
'get_extra_info') and transport.get_extra_info(
76+
'sockname') is not None:
77+
_logger.debug(
78+
"Socket [%s:%s] opened" % transport.get_extra_info(
79+
'sockname')[:2])
80+
elif hasattr(transport, 'serial'):
7881
_logger.debug(
79-
"Serial connection opened on port: {}".format(transport.serial.port)
82+
"Serial connection opened on port: {}".format(
83+
transport.serial.port)
8084
)
81-
85+
else:
86+
_logger.warning(f"Unabel to get information about"
87+
f" transport {transport}")
8288
self.transport = transport
8389
self.running = True
8490
self.framer = self.server.framer(self.server.decoder, client=None)
@@ -721,7 +727,7 @@ def __init__(self, context, framer=None, identity=None, **kwargs): # pragma: no
721727
to a missing slave
722728
:param broadcast_enable: True to treat unit_id 0 as broadcast address,
723729
False to treat 0 as any other unit_id
724-
:param autoreonnect: True to enable automatic reconnection,
730+
:param auto_reconnect: True to enable automatic reconnection,
725731
False otherwise
726732
:param reconnect_delay: reconnect delay in seconds
727733
:param response_manipulator: Callback method for
@@ -803,7 +809,7 @@ def on_connection_lost(self):
803809
self._check_reconnect()
804810

805811
def _check_reconnect(self):
806-
_logger.debug("checkking autoreconnect {} {}".format(
812+
_logger.debug("checking autoreconnect {} {}".format(
807813
self.auto_reconnect, self.reconnecting_task))
808814
if self.auto_reconnect and (self.reconnecting_task is None):
809815
_logger.debug("Scheduling serial connection reconnect")

0 commit comments

Comments
 (0)