Enh : Set module/worker processes name to be more explicit

setup.py

@@ -607,6 +607,9 @@ def update_file_with_string(infilename, outfilename, match, new_string):
         install_requires=[
             required_pkgs
         ],
+        extras_require={
+            'setproctitle': ['setproctitle']
+        },
 
         scripts=glob('bin/shinken-[!_]*'),
 

shinken/basemodule.py

@@ -244,8 +244,17 @@ def do_loop_turn(self):
         """
         raise NotImplementedError()
 
+    def set_proctitle(self, name):
+        try:
+            from setproctitle import setproctitle
+            setproctitle("shinken-module: %s" % name)
+        except:
+            pass
+
     def main(self):
         """module "main" method. Only used by external modules."""
+        self.set_proctitle(self.name)
+
         self.set_signal_handler()
         logger.info("[%s[%d]]: Now running.." % (self.name, os.getpid()))
         while not self.interrupted:

shinken/modules/android_sms.py

@@ -194,6 +194,8 @@ def read_and_parse_sms(self):
     # c = Control Queue for the worker
     def work(self, s, returns_queue, c):
         print "Module Android started!"
+        self.set_proctitle(self.name)
+
         self.android = android.Android()
         timeout = 1.0
         self.checks = []

shinken/modules/collectd_arbiter.py

@@ -297,6 +297,7 @@ def __init__(self, modconf):
 
     # When you are in "external" mode, that is the main loop of your process
     def main(self):
+        self.set_proctitle(self.name)
         self.set_exit_handler()
 
         last_check = 0.0

shinken/modules/livestatus_broker/livestatus_broker.py

@@ -162,6 +162,8 @@ def set_debug(self):
         os.dup2(fdtemp, 2)  # standard error (2)
 
     def main(self):
+        self.set_proctitle(self.name)
+
         self.log = logger
         self.log.load_obj(self)
         # Daemon like init

shinken/modules/named_pipe.py

@@ -107,6 +107,7 @@ def get(self):
 
     # When you are in "external" mode, that is the main loop of your process
     def main(self):
+        self.set_proctitle(self.name)
         self.set_exit_handler()
 
         self.open()

shinken/modules/npcdmod_broker.py

@@ -196,6 +196,8 @@ def rotate(self):
     # This version does not use a signal-based timer yet. Rotation is triggered
     # by a constant flow of status update broks
     def main(self):
+        self.set_proctitle(self.name)
+
         self.set_exit_handler()
         self.rotate()
         last_rotated = time.time()

shinken/modules/nrpe_poller.py

@@ -465,6 +465,8 @@ def work(self, s, returns_queue, c):
         print "[Nrpe] Module NRPE started!"
         ## restore default signal handler for the workers:
         signal.signal(signal.SIGTERM, signal.SIG_DFL)
+        self.set_proctitle(self.name)
+
         timeout = 1.0
         self.checks = []
 

shinken/modules/nsca.py

@@ -180,6 +180,8 @@ def process_check_result(self, databuffer, IV):
 
     # When you are in "external" mode, that is the main loop of your process
     def main(self):
+        self.set_proctitle(self.name)
+
         self.set_exit_handler()
         backlog = 5
         size = 8192

shinken/modules/status_dat_broker/status_dat_broker.py

@@ -370,6 +370,7 @@ def update_element(self, e, data):
             setattr(e, prop, data[prop])
 
     def main(self):
+        self.set_proctitle(self.name)
         self.set_exit_handler()
         last_generation = time.time()
         objects_cache_written = False

shinken/modules/tsca.py

@@ -166,6 +166,8 @@ def post_command(self, timestamp, rc, hostname, service, output):
 
     # When you are in "external" mode, that is the main loop of your process
     def main(self):
+        self.set_proctitle(self.name)
+
         self.set_exit_handler()
         try:
             handler = StateServiceHandler(self)

shinken/modules/webui_broker/webui_broker.py

@@ -125,6 +125,8 @@ def want_brok(self, b):
         return self.rg.want_brok(b)
 
     def main(self):
+        self.set_proctitle(self.name)
+
         self.log = logger
         self.log.load_obj(self)
 

shinken/modules/ws_arbiter.py

@@ -117,6 +117,9 @@ def init_http(self):
     def main(self):
         global app
 
+        # Change process name (seen in ps or top)
+        self.set_proctitle(self.name)
+
         # It's an external module, so we need to be sure that we manage
         # the signals
         self.set_exit_handler()

shinken/worker.py

@@ -213,6 +213,9 @@ def work(self, s, returns_queue, c):
         # but on android, we are a thread, so don't do it
         if not is_android:
             signal.signal(signal.SIGTERM, signal.SIG_DFL)
+
+        self.set_proctitle()
+
         timeout = 1.0
         self.checks = []
         self.returns_queue = returns_queue
@@ -261,3 +264,11 @@ def work(self, s, returns_queue, c):
             timeout -= time.time() - begin
             if timeout < 0:
                 timeout = 1.0
+
+    def set_proctitle(self):
+        try:
+            from setproctitle import setproctitle
+            setproctitle("shinken-worker")
+        except:
+            pass
+