shutdown quality fixes
This commit is contained in:
parent
6f91ba1b33
commit
503d0b33d0
|
@ -1,3 +1,4 @@
|
||||||
|
"""shutdown function"""
|
||||||
import os
|
import os
|
||||||
import Queue
|
import Queue
|
||||||
import threading
|
import threading
|
||||||
|
@ -15,8 +16,7 @@ from queues import (
|
||||||
|
|
||||||
|
|
||||||
def doCleanShutdown():
|
def doCleanShutdown():
|
||||||
# Used to tell proof of work worker threads
|
"""Used to tell proof of work worker threads and the objectProcessorThread to exit."""
|
||||||
# and the objectProcessorThread to exit.
|
|
||||||
state.shutdown = 1
|
state.shutdown = 1
|
||||||
|
|
||||||
objectProcessorQueue.put(('checkShutdownVariable', 'no data'))
|
objectProcessorQueue.put(('checkShutdownVariable', 'no data'))
|
||||||
|
@ -76,10 +76,10 @@ def doCleanShutdown():
|
||||||
except Queue.Empty:
|
except Queue.Empty:
|
||||||
break
|
break
|
||||||
|
|
||||||
if shared.thisapp.daemon or not state.enableGUI: # FIXME redundant?
|
if shared.thisapp.daemon or not state.enableGUI: # ..fixme:: redundant?
|
||||||
logger.info('Clean shutdown complete.')
|
logger.info('Clean shutdown complete.')
|
||||||
shared.thisapp.cleanup()
|
shared.thisapp.cleanup()
|
||||||
os._exit(0)
|
os._exit(0) # pylint: disable=protected-access
|
||||||
else:
|
else:
|
||||||
logger.info('Core shutdown complete.')
|
logger.info('Core shutdown complete.')
|
||||||
for thread in threading.enumerate():
|
for thread in threading.enumerate():
|
||||||
|
|
Reference in New Issue
Block a user