12
12
from warnings import warn
13
13
14
14
# add a logger for pyModbusTCP.server
15
- logger = logging .getLogger (__name__ )
15
+ logger = logging .getLogger ('pyModbusTCP.server' )
16
16
17
17
18
18
class DataBank :
@@ -672,7 +672,7 @@ def handle(self):
672
672
session_data = ModbusServer .SessionData ()
673
673
(session_data .client .address , session_data .client .port ) = self .request .getpeername ()
674
674
# debug message
675
- logger .debug ('accept new connection %r' , session_data .client )
675
+ logger .debug ('Accept new connection from %r' , session_data .client )
676
676
try :
677
677
# main processing loop
678
678
while True :
@@ -690,7 +690,7 @@ def handle(self):
690
690
self ._send_all (session_data .response .raw )
691
691
except (ModbusServer .Error , socket .error ) as e :
692
692
# debug message
693
- logger .debug ('exception during request handling: %r' , e )
693
+ logger .debug ('Exception during request handling: %r' , e )
694
694
# on main loop except: exit from it and cleanly close the current socket
695
695
self .request .close ()
696
696
@@ -985,8 +985,11 @@ def start(self):
985
985
# TODO test no_delay with bench
986
986
self ._service .socket .setsockopt (socket .IPPROTO_TCP , socket .TCP_NODELAY , 1 )
987
987
# bind and activate
988
- self ._service .server_bind ()
989
- self ._service .server_activate ()
988
+ try :
989
+ self ._service .server_bind ()
990
+ self ._service .server_activate ()
991
+ except OSError as e :
992
+ raise ModbusServer .NetworkError (e )
990
993
# serve request
991
994
if self .no_block :
992
995
self ._serve_th = Thread (target = self ._serve )
0 commit comments