diff --git a/server/BackendProvider/WemosStripUDPServer.py b/server/BackendProvider/UDPSocketProvider.py similarity index 97% rename from server/BackendProvider/WemosStripUDPServer.py rename to server/BackendProvider/UDPSocketProvider.py index bf7b3ac..39f9b1e 100644 --- a/server/BackendProvider/WemosStripUDPServer.py +++ b/server/BackendProvider/UDPSocketProvider.py @@ -9,7 +9,7 @@ import struct class ThreadedUDPServer(threading.Thread): def __init__(self, effectController, rgbStripController): - threading.Thread.__init__(self) + threading.Thread.__init__(self, name="ThreadedUDPServer") self.effectController = effectController self.rgbStripController = rgbStripController self.daemon = True @@ -34,7 +34,7 @@ class ThreadedUDPServer(threading.Thread): # when there is no answer after 2 seconds class UDPClientGuardian(threading.Thread): def __init__(self): - threading.Thread.__init__(self) + threading.Thread.__init__(self,name="UDPClientGuardian") self.stopped = False def run(self): @@ -96,7 +96,7 @@ class UDPClient(): # r:1:NUM_LEDS[:nosend] # UDP Stripe sendet ping, woran festgemacht wird, ob er nocht lebt # s:ping - # UDP + # UDP try: data = clientdata.split(':') diff --git a/server/BackendProvider/WebSocketServer.py b/server/BackendProvider/WebSocketProvider.py similarity index 99% rename from server/BackendProvider/WebSocketServer.py rename to server/BackendProvider/WebSocketProvider.py index 66c7057..e894d4e 100644 --- a/server/BackendProvider/WebSocketServer.py +++ b/server/BackendProvider/WebSocketProvider.py @@ -4,7 +4,7 @@ from functools import partial class ThreadedWebSocketServer(Thread): def __init__(self,effectController,rgbStripController): - Thread.__init__(self) + Thread.__init__(self,name="WebSocketServer") self.effectController = effectController self.rgbStripController = rgbStripController self.daemon = True diff --git a/server/LEDServer.py b/server/LEDServer.py index 611a4ea..e9be13f 100755 --- a/server/LEDServer.py +++ b/server/LEDServer.py @@ -39,13 +39,13 @@ def main(): # or an other frontend / rgbStrip backend provider not using websockets. you could integrate alexa, phillips hue like lamps or whatever you like! # but then there must be some autoloading of modules in a folder like the effects for easy installing. //todo :) print("starting websocket:8001") - import BackendProvider.WebSocketServer as WebSocketServer - webSocketThread = WebSocketServer.ThreadedWebSocketServer( + import BackendProvider.WebSocketProvider as WebSocketProvider + webSocketThread = WebSocketProvider.ThreadedWebSocketServer( effectController, rgbStripController) - print("starting UDPServer:8002") - import BackendProvider.WemosStripUDPServer as UPDSocketServer - udpSocketThread = UPDSocketServer.ThreadedUDPServer( + print("starting UPDSocketProvider:8002") + import BackendProvider.UDPSocketProvider as UPDSocketProvider + udpSocketThread = UPDSocketProvider.ThreadedUDPServer( effectController, rgbStripController) while running: diff --git a/server/rgbUtils/effectController.py b/server/rgbUtils/effectController.py index 630e3c4..00a268e 100644 --- a/server/rgbUtils/effectController.py +++ b/server/rgbUtils/effectController.py @@ -34,6 +34,7 @@ class effectController: self.effectsList = self.getEffectsListFromDir() # start the offEffect by default self.offEffectThreadObject = self.startEffect(offEffect,[]) + # - a bit of failover handling, remove dead threads from effectThread array # - move strips without an effect to the offEffect self.effectGuardian = self.effectGuardian(self) @@ -156,9 +157,12 @@ class effectController: self.effectThreads.remove(effectThread) self.noticeControllerChange() + # - a bit of failover handling, remove dead threads from effectThread array + # - move strips without an effect to the offEffect class effectGuardian(threading.Thread): def __init__(self, effectController): - threading.Thread.__init__(self) + threading.Thread.__init__(self, name='effectGuardian') + self.effectController = effectController self.stopped = False