Changeset 3381

Timestamp:

08/15/13 10:56:56 (11 years ago)

Author:

sanmai

Message:

• Fix validation: it was always judged as valid even if invalid.

File:

• monitoring/plugins/mpi/generic_tla_monitoring.py (modified) (8 diffs)

monitoring/plugins/mpi/generic_tla_monitoring.py

@@ -50 +50 @@
     special_plugin_file_name = kwargs['special_plugin_file_name'] # X-
 
-    timestamp                = datetime.datetime.today().isoformat()
+    timestamp = datetime.datetime.today().isoformat()
+    valid = False
 
     try :
-        special_validator(data, 
-                          descriptive_string, 
-                          kwargs)
+        valid = special_validator(data, 
+                                  descriptive_string, 
+                                  kwargs)
     except :
-        traceback_string  = traceback.format_exc()
+        traceback_string = traceback.format_exc()
         #pdb.set_trace()
 
-        err_log_file_path = os.path.normpath("/tmp/" + special_plugin_file_name + "_err_well-formedness_check__" + descriptive_string.replace('/' , '%2F') + "__" + timestamp + ".log")
+        err_log_file_path = os.path.normpath("/tmp/" + special_plugin_file_name + "_err_generic_validator__" + descriptive_string.replace('/' , '%2F') + "__" + timestamp + ".log")
 
         with open(name = err_log_file_path,
                   mode = "wt") as debugging_output_file :
             debugging_output_file.write(traceback_string)
-        
-        return False
-    else :
-        return True
+        sys.exit(999) # X- exit with some special error status
+    
+    return valid
 
 
@@ -94 +94 @@
                                        special_validator)
 
-    return (wellformedness)
+    return wellformedness
 
 
@@ -110 +110 @@
                                        special_validator)
 
-    return (wellformedness)
+    return wellformedness
 
 
@@ -120 +120 @@
                           descriptive_string, 
                           kwargs) :
+
         try :            
             data_tree_root_element = xml.etree.ElementTree.XML(text = data)
@@ -125 +126 @@
             if data_tree_root_element.tag == kwargs['valid_root_element_tag'] :
                 return True
-
-            return False
+            else :
+                return False
         except :
             return False
@@ -134 +135 @@
                                        kwargs, 
                                        special_validator)
-    return (wellformedness)
+    return wellformedness
 
 
@@ -234 +235 @@
     else :
         try :
-            response         = conn.getresponse()
-
-            data             = response.read()
+            response = conn.getresponse()
+
+            data = response.read()
             
             conn.close()
@@ -255 +256 @@
             # HTTP status codes 200 and 302
             # X- Resolve redirect in case of HTTP status == 302
-                well_formed  = validator(data                   = data, 
+                well_formed = validator(data                    = data, 
                                          descriptive_string     = UP_URL, 
                                          **validator_arguments) # ['validator_arguments'])