|
|
@ -22,7 +22,7 @@ WATCHDOG_FN = "/dev/shm/wd_" |
|
|
|
ENABLE_WATCHDOG = os.getenv("NO_WATCHDOG") is None |
|
|
|
ENABLE_WATCHDOG = os.getenv("NO_WATCHDOG") is None |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def launcher(proc): |
|
|
|
def launcher(proc, name): |
|
|
|
try: |
|
|
|
try: |
|
|
|
# import the process |
|
|
|
# import the process |
|
|
|
mod = importlib.import_module(proc) |
|
|
|
mod = importlib.import_module(proc) |
|
|
@ -33,6 +33,9 @@ def launcher(proc): |
|
|
|
# create new context since we forked |
|
|
|
# create new context since we forked |
|
|
|
messaging.context = messaging.Context() |
|
|
|
messaging.context = messaging.Context() |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# add daemon name to cloudlog ctx |
|
|
|
|
|
|
|
cloudlog.bind(daemon=name) |
|
|
|
|
|
|
|
|
|
|
|
# exec the process |
|
|
|
# exec the process |
|
|
|
mod.main() |
|
|
|
mod.main() |
|
|
|
except KeyboardInterrupt: |
|
|
|
except KeyboardInterrupt: |
|
|
@ -223,7 +226,7 @@ class PythonProcess(ManagerProcess): |
|
|
|
return |
|
|
|
return |
|
|
|
|
|
|
|
|
|
|
|
cloudlog.info("starting python %s" % self.module) |
|
|
|
cloudlog.info("starting python %s" % self.module) |
|
|
|
self.proc = Process(name=self.name, target=launcher, args=(self.module,)) |
|
|
|
self.proc = Process(name=self.name, target=launcher, args=(self.module, self.name)) |
|
|
|
self.proc.start() |
|
|
|
self.proc.start() |
|
|
|
self.watchdog_seen = False |
|
|
|
self.watchdog_seen = False |
|
|
|
self.shutting_down = False |
|
|
|
self.shutting_down = False |
|
|
|