mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix cloning of inbox thread

master
Bob Mottram 2019-09-03 12:10:53 +01:00
parent d325501a31
commit 832c1cd39b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
inbox.py
View File

@ -1140,13 +1140,14 @@ def runInboxQueueWatchdog(projectVersion: str,httpd) -> None:
"""This tries to keep the inbox thread running even if it dies """This tries to keep the inbox thread running even if it dies
""" """
print('Starting inbox queue watchdog') print('Starting inbox queue watchdog')
inboxQueueOriginal=httpd.thrInboxQueue.clone() inboxQueueOriginal=httpd.thrInboxQueue.clone(runInboxQueue)
#httpd.thrInboxQueue=inboxQueueOriginal
httpd.thrInboxQueue.start() httpd.thrInboxQueue.start()
while True: while True:
time.sleep(20) time.sleep(20)
if not httpd.thrInboxQueue.isAlive(): if not httpd.thrInboxQueue.isAlive():
httpd.thrInboxQueue.kill() httpd.thrInboxQueue.kill()
httpd.thrInboxQueue=inboxQueueOriginal.clone() httpd.thrInboxQueue=inboxQueueOriginal.clone(runInboxQueue)
httpd.thrInboxQueue.start() httpd.thrInboxQueue.start()
print('Restarting inbox queue...') print('Restarting inbox queue...')

7
threads.py
View File

@ -42,6 +42,7 @@ class threadWithTrace(threading.Thread):
def kill(self): def kill(self):
self.killed = True self.killed = True
def clone(self): def clone(self,fn):
return threadWithTrace(target=self, \ return threadWithTrace(target=fn, \
args=(self._args),daemon=True) args=self._args, \
daemon=True)