X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodemanager.py;h=4b030d5bd2611738e7ffaeaac107a451c28e3b23;hb=cbe129e67722d4c042fd48d045ef43d8796381e8;hp=57c96c7d95f6b2a3feaedb27c65244f0bb5d9e76;hpb=b73120ba3084fb66167ac70ec3632b74353c08ca;p=nodemanager.git

diff --git a/nodemanager.py b/nodemanager.py
index 57c96c7..4b030d5 100755
--- a/nodemanager.py
+++ b/nodemanager.py
@@ -183,6 +183,7 @@ class NodeManager:
             # set log level
             if (self.options.verbose):
                 logger.set_level(logger.LOG_VERBOSE)
+            tools.init_signals()
 
             # Load /etc/planetlab/plc_config
             config = Config(self.options.config)
@@ -261,7 +262,10 @@ If this is not the case, please remove the pid file %s. -- exiting""" % (other_p
                 work_duration=int(work_end-work_beg)
                 logger.log('nodemanager: mainloop has worked for %s s - sleeping for %d s'%(work_duration,delay))
                 time.sleep(delay)
-        except: logger.log_exc("nodemanager: failed in run")
+        except SystemExit:
+            pass
+        except: 
+            logger.log_exc("nodemanager: failed in run")
 
 def run():
     logger.log("======================================== Entering nodemanager.py")