Changeset 4062 for monitoring

Timestamp:

11/19/13 17:02:25 (11 years ago)

Author:

sanmai

Message:

• Fix to reflect changes in interface of check_condition.

Location:

monitoring/plugins/mpi

Files:

• check_lat_avatech_clam.py (modified) (1 diff)
• check_lat_oai_endpoint.py (modified) (1 diff)
• generic_tla_monitoring.py (modified) (5 diffs)

monitoring/plugins/mpi/check_lat_avatech_clam.py

@@ -13 +13 @@
 valid_root_element_tag = "clam"
 
-def special_main_subroutine(host, 
+def special_main_subroutine(scheme, 
+                            host, 
                             http_path,
                             port_number) : 

monitoring/plugins/mpi/check_lat_oai_endpoint.py

@@ -14 +14 @@
 
 
-def special_main_subroutine(host, 
+def special_main_subroutine(scheme, 
+                            host, 
                             http_path,
                             port_number) : 

monitoring/plugins/mpi/generic_tla_monitoring.py

@@ -298 +298 @@
     timestamp = datetime.datetime.today().isoformat()
     
-    try :
-        if protocol == 'http' :
+    try : 
+        if protocol == 'http' : 
             conn = httplib.HTTPConnection(host = host, 
                                           port = port_number, 
                                           strict = True)
-        elif protocol == 'https' :
-
-            
+        elif protocol == 'https' :            
             conn = httplib.HTTPSConnection(host = host, 
                                            port = port_number, 
@@ -311 +309 @@
         request = conn.request(HTTP_method, 
                                http_path)
-    except :
+    except : 
         traceback_string = traceback.format_exc()
 
@@ -322 +320 @@
                                                                                                             host = host)
                }
-    else :
-        try :
+    else : 
+        try : 
             response = conn.getresponse()
 
@@ -329 +327 @@
             
             conn.close()
-        except :
+        except : 
             traceback_string = traceback.format_exc()
 
             handle_connection_failure(traceback_string + "\nThis problem originates from location 2 in '" + special_plugin_file_name + "'.\n")
-        else :
+        else : 
 
             redirecting_responses = frozenset([
@@ -342 +340 @@
                                           ])  
 
-            if response.status == httplib.OK :
-            # HTTP status codes 200 and 302
-            # X- Resolve redirect in case of HTTP status == 302
+            if response.status == httplib.OK : 
+                # HTTP status codes 200 and 302
+                # X- Resolve redirect in case of HTTP status == 302
                 well_formed = validator(data                   = data, 
                                         descriptive_string     = http_path, 
                                         **validator_arguments) # ['validator_arguments'])
 
-                if well_formed :
-
+                if well_formed : 
                     return {
                             "code"      : "OK",