Skip to content

#322 reuse address #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dhoomakethu merged 4 commits into from
Sep 7, 2018
Merged

#322 reuse address #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2fa012b
Update Changelog
dhoomakethu May 14, 2018
75951f0
Merge branch 'dev' of https://github.com/riptideio/pymodbus into dev
dhoomakethu May 15, 2018
c303e33
Merge branch 'dev' of https://github.com/riptideio/pymodbus into dev
dhoomakethu Aug 29, 2018
af5d136
#322 allow reusing of server address
dhoomakethu Aug 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ Version 1.5.0
* Modbus read retries works only when empty/no message is received
* Change test runner from nosetest to pytest
* Fix Misc examples
>>>>>>> master

Version 1.4.0
------------------------------------------------------------
Expand Down
6 changes: 5 additions & 1 deletion pymodbus/server/sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,8 @@ class ModbusTcpServer(socketserver.ThreadingTCPServer):
"""

def __init__(self, context, framer=None, identity=None,
address=None, handler=None, **kwargs):
address=None, handler=None, allow_reuse_address=False,
**kwargs):
""" Overloaded initializer for the socket server

If the identify structure is not passed in, the ModbusControlBlock
Expand All @@ -285,10 +286,13 @@ def __init__(self, context, framer=None, identity=None,
:param address: An optional (interface, port) to bind to.
:param handler: A handler for each client session; default is
ModbusConnectedRequestHandler
:param allow_reuse_address: Whether the server will allow the
reuse of an address.
:param ignore_missing_slaves: True to not send errors on a request
to a missing slave
"""
self.threads = []
self.allow_reuse_address = allow_reuse_address
self.decoder = ServerDecoder()
self.framer = framer or ModbusSocketFramer
self.context = context or ModbusServerContext()
Expand Down