Changeset 3561 for monitoring

Timestamp:

09/12/13 18:29:31 (11 years ago)

Author:

sanmai

Message:

• Use multiprocessing module to improve handling of privilege gain and loss in check_ldap().

File:

• monitoring/plugins/mpi/generic_tla_monitoring.py (modified) (1 diff)

monitoring/plugins/mpi/generic_tla_monitoring.py

@@ -194 +194 @@
     Nagios_uid = pwd.getpwnam('nagios')[2]
 
-    current_process_ID = os.fork()
-
-    if current_process_ID == 0 :
-        ## Child process code
-        
+    import multiprocessing
+
+    # def info(title):
+    #     print title
+    #     print 'module name:', __name__
+    #     if hasattr(os, 'getppid'):  # only available on Unix
+    #         print 'parent process:', os.getppid()
+    #     print 'process id:', os.getpid()
+
+    def LDAP_query(OpenDJ_uid, command, LDAP_result_queue):
         try :
             os.setuid(OpenDJ_uid)
         except OSError, e :
             raise e
-
-        process = subprocess.Popen(command, 
-                                   stdout = subprocess.PIPE, 
-                                   stderr = subprocess.PIPE)
-
-        stdout, stderr = process.communicate()
-
-        if process.returncode == 0 : 
-            result = { "code"      : "OK", 
-                       "message"   : 'Host %s is up and responds as expected to a query "%s" with base DN "%s".' % (host, query, base_DN)
-                     }
         else :
-            result = { "code"      : "CRITICAL", 
-                       "message"   : 'Host %s is not up or does not respond as expected to a query "%s" with base DN "%s".' % (host, query, base_DN)
-                     }
-
-        os._exit(0)
+          process = subprocess.Popen(command, 
+                                     stdout = subprocess.PIPE, 
+                                     stderr = subprocess.PIPE)
+
+          stdout, stderr = process.communicate()
+          
+          if process.returncode == 0 :
+              LDAP_result_queue.put(True)
+          else :
+              LDAP_result_queue.put(False)
+
+
+    LDAP_result_queue = multiprocessing.Queue()
+    LDAP_query_process = multiprocessing.Process(target = LDAP_query, args = (OpenDJ_uid, command, LDAP_result_queue))
+    LDAP_query_process.start()
+    result = LDAP_result_queue.get()
+    LDAP_query_process.join()
+
+
+    if result == True:
+        return { "code"      : "OK", 
+               "message"   : 'Host %s is up and responds as expected to a query "%s" with base DN "%s".' % (host, query, base_DN)
+             }
+    else :
+        return { "code"      : "CRITICAL", 
+                   "message"   : 'Host %s is not up or does not respond as expected to a query "%s" with base DN "%s".' % (host, query, base_DN)
+                 }
+
+    # current_process_ID = os.fork()
+
+    # if current_process_ID == 0 :
+    #     ## Child process code
+        
      
-    ## Parent process code. Wait for ldapsearch child process.
-    os.waitpid(current_process_ID, 0)
+
+    #     os._exit(0)
+     
+    # ## Parent process code. Wait for ldapsearch child process.
+    # os.waitpid(current_process_ID, 0)
     
     try :