Changeset 2033

Timestamp:

07/13/12 14:10:17 (12 years ago)

Author:

sanmai

Message:

• FIX: A condition was missed, resulting in lack of proper Nagios exit code and ultimately a runtime exception.
• FIX: A parameter to templib.NamedTemporaryFile? has been added with Python v2.6, therefore with Python versions < v2.5 reading of the temporary file by the external shell script failed silently,

ultima$
valid> by check_response_data_validity().

File:

• monitoring/plugins/mpi/check_clarin_saml.py (modified) (5 diffs)

monitoring/plugins/mpi/check_clarin_saml.py

@@ -57 +57 @@
     check_saml_metadata_file_path       = os.path.join(CLARIN_server_root_directory_path, "aai/check-saml-metadata/check_saml_metadata.sh")
     
-    with tempfile.NamedTemporaryFile(mode   = 'wb', 
-                                     delete = False) as temporary_file :
-        temporary_file.write(data)
-        XML_response_metadata_file_path = temporary_file.name
+    temporary_file                      = tempfile.NamedTemporaryFile(mode   = 'wb')                                    
+    temporary_file.write(data)
+    temporary_file.flush()
+
+    XML_response_metadata_file_path     = temporary_file.name
+
 
     command                             = [check_saml_metadata_file_path, XML_response_metadata_file_path]
+
         
     process                             = subprocess.Popen(command, 
@@ -70 +73 @@
     stdout, stderr                      = process.communicate()
 
+    temporary_file.close()
+
     interpretation_tuple                = (interpret_for_well_formedness(stdout), interpret_for_validity(stdout),)
 
-    os.unlink(XML_response_metadata_file_path)
+    #os.unlink(XML_response_metadata_file_path)
 
     return(interpretation_tuple)
@@ -78 +83 @@
 
 def check_condition(host) :
+
     UP_URL  = '/aai/clarin-sp-metadata.xml'
 
@@ -108 +114 @@
                         "message"   : 'Host %s, service %s is up and returns well-formed, but invalid XML data.' % (host, DESCRIPTION)
                        }
+        else :
+            return {
+                        "code"      : "CRITICAL", 
+                        "message"   : 'Host %s, service %s is up but returns non-well-formed XML data.' % (host, DESCRIPTION)
+                    }
     else :
         return {
@@ -115 +126 @@
 
 def test_case(host) :
-    with open(os.path.join(CLARIN_server_root_directory_path, "aai/clarin-sp-metadata.xml"),
+    metadata_file = open(os.path.join(CLARIN_server_root_directory_path, "aai/clarin-sp-metadata.xml"),
               mode      = "r+", 
-              buffering = 0) as metadata_file :
+              buffering = 0)
         
-        data = metadata_file.read()
+    data = metadata_file.read()
+
+    metadata_file.close()       
 
     interpretation_tuple = check_response_data_validity(data)