Join listening thread in signalreceiver on shutdown

This commit is contained in:
Andrew Resch 2008-06-17 19:49:43 +00:00
parent 2578ca3e21
commit 3d5a1d3540
1 changed files with 4 additions and 2 deletions

View File

@ -74,6 +74,8 @@ class SignalReceiver(ThreadingMixIn, SimpleXMLRPCServer.SimpleXMLRPCServer):
log.debug("Shutting down signalreceiver") log.debug("Shutting down signalreceiver")
self.socket.shutdown(socket.SHUT_RDWR) self.socket.shutdown(socket.SHUT_RDWR)
log.debug("Joining listening thread..")
self.listening_thread.join(1.0)
return return
def set_remote(self, remote): def set_remote(self, remote):
@ -107,12 +109,12 @@ class SignalReceiver(ThreadingMixIn, SimpleXMLRPCServer.SimpleXMLRPCServer):
# Register the signal receiver with the core # Register the signal receiver with the core
client.register_client(str(self.port)) client.register_client(str(self.port))
t = threading.Thread(target=self.handle_thread) self.listening_thread = threading.Thread(target=self.handle_thread)
gobject.timeout_add(50, self.handle_signals) gobject.timeout_add(50, self.handle_signals)
try: try:
t.start() self.listening_thread.start()
except Exception, e: except Exception, e:
log.debug("Thread: %s", e) log.debug("Thread: %s", e)