From: Jason T. <ta...@ur...> - 2008-06-22 18:02:18
|
Author: tack Date: Sun Jun 22 14:02:23 2008 New Revision: 3303 Log: Don't use pid in determining mainloop running state. This partially reverts r3047, as I'm not sure what in the hell I was thinking. Modified: trunk/base/src/notifier/main.py Modified: trunk/base/src/notifier/main.py ============================================================================== --- trunk/base/src/notifier/main.py (original) +++ trunk/base/src/notifier/main.py Sun Jun 22 14:02:23 2008 @@ -58,9 +58,8 @@ # get logging object log = logging.getLogger('notifier') -# pid of the process running the notifier loop. This lets run() know -# if we've just forked and we want to run a new loop. -_running_pid = None +# Running state of the main loop, True if running, False otherwise. +_running = False # Set if currently in shutdown() (to prevent reentrancy) _shutting_down = False # Lock preventing multiple threads from executing loop(). @@ -250,7 +249,7 @@ """ Return if the main loop is currently running. """ - return _running_pid == os.getpid() + return _running def is_shutting_down(): @@ -264,11 +263,8 @@ """ Set mainloop running status. """ - global _running_pid - if status: - _running_pid = os.getpid() - else: - _running_pid = None + global _running + _running = status def _shutdown_check(*args): |