BOSWatch/BW3-Core
1
0
Fork 0
mirror of https://github.com/BOSWatch/BW3-Core.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

various pylint fixes

Browse source
This commit is contained in:
Bastian Schroll 2019-03-03 19:39:53 +01:00
parent 7256cfca3a
commit c76c179225
6 changed files with 18 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
boswatch/network/broadcast.py
View file

@ -109,21 +109,16 @@ class BroadcastServer:
"""!Start the broadcast server in a new thread """!Start the broadcast server in a new thread
@return True or False""" @return True or False"""
try: if not self.isRunning:
if not self.isRunning: logging.debug("start udp broadcast server")
logging.debug("start udp broadcast server") self._serverThread = threading.Thread(target=self._listen)
self._serverThread = threading.Thread(target=self._listen) self._serverThread.name = "BroadServ"
self._serverThread.name = "BroadServ" self._serverThread.daemon = True
self._serverThread.daemon = True self._serverShutdown = False
self._serverShutdown = False self._serverThread.start()
self._serverThread.start() return True
return True logging.warning("udp broadcast server always started")
else: return True
logging.warning("udp broadcast server always started")
return True
except: # pragma: no cover
logging.exception("cannot start udp broadcast server thread")
return False
def stop(self): def stop(self):
"""!Stop the broadcast server """!Stop the broadcast server
@ -142,8 +137,6 @@ class BroadcastServer:
logging.warning("udp broadcast server always stopped") logging.warning("udp broadcast server always stopped")
return True return True
return False
def _listen(self): def _listen(self):
"""!Broadcast server worker thread """!Broadcast server worker thread

10
boswatch/network/client.py
View file

@ -43,9 +43,8 @@ class TCPClient:
self._sock = socket.create_connection((host, port)) self._sock = socket.create_connection((host, port))
logging.debug("connected to %s:%s", host, port) logging.debug("connected to %s:%s", host, port)
return True return True
else: logging.warning("client always connected")
logging.warning("client always connected") return True
return True
except ConnectionRefusedError: except ConnectionRefusedError:
logging.error("cannot connect to %s:%s - connection refused", host, port) logging.error("cannot connect to %s:%s - connection refused", host, port)
except socket.timeout: # pragma: no cover except socket.timeout: # pragma: no cover
@ -62,9 +61,8 @@ class TCPClient:
self._sock = None self._sock = None
logging.debug("disconnected") logging.debug("disconnected")
return True return True
else: logging.warning("client not connected")
logging.warning("client not connected") return True
return True
except AttributeError: except AttributeError:
logging.error("cannot disconnect - no connection established") logging.error("cannot disconnect - no connection established")
return False return False

5
boswatch/network/server.py
View file

@ -128,9 +128,8 @@ class TCPServer:
self._server = None self._server = None
logging.debug("TCPServer stopped") logging.debug("TCPServer stopped")
return True return True
else: logging.warning("server always stopped")
logging.warning("server always stopped") return True
return True
def countClientsConnected(self): def countClientsConnected(self):
"""!Number of currently connected Clients """!Number of currently connected Clients

5
boswatch/utils/timer.py
View file

@ -54,9 +54,8 @@ class RepeatedTimer:
self._thread.start() self._thread.start()
logging.debug("start repeatedTimer: %s", self._thread.name) logging.debug("start repeatedTimer: %s", self._thread.name)
return True return True
else: logging.debug("repeatedTimer always started")
logging.debug("repeatedTimer always started") return True
return True
def stop(self): def stop(self):
"""!Stop the timer worker thread """!Stop the timer worker thread

2
module/module.py
View file

@ -35,7 +35,6 @@ class Module:
self._cumTime = 0 self._cumTime = 0
self._moduleTime = 0 self._moduleTime = 0
self._tmpTime = 0 self._tmpTime = 0
self._tmpTime = 0
# for statistics # for statistics
self._runCount = 0 self._runCount = 0
@ -68,7 +67,6 @@ class Module:
self._moduleTime = time.time() - self._tmpTime self._moduleTime = time.time() - self._tmpTime
self._cumTime += self._moduleTime self._cumTime += self._moduleTime
self._endTime = time.time()
logging.debug("[%s] took %0.3f seconds", self._moduleName, self._moduleTime) logging.debug("[%s] took %0.3f seconds", self._moduleName, self._moduleTime)

2
plugin/plugin.py
View file

@ -42,7 +42,6 @@ class Plugin:
self._setupTime = 0 self._setupTime = 0
self._alarmTime = 0 self._alarmTime = 0
self._teardownTime = 0 self._teardownTime = 0
self._endTime = 0
self._tmpTime = 0 self._tmpTime = 0
# for statistics # for statistics
@ -111,7 +110,6 @@ class Plugin:
self._teardownTime = time.time() - self._tmpTime self._teardownTime = time.time() - self._tmpTime
self._sumTime = self._setupTime + self._alarmTime + self._teardownTime self._sumTime = self._setupTime + self._alarmTime + self._teardownTime
self._cumTime += self._sumTime self._cumTime += self._sumTime
self._endTime = time.time()
self._bwPacket = None self._bwPacket = None