Changeset 4047 for monitoring/plugins/mpi/check_lat_oai_endpoint.py

Timestamp:

11/19/13 11:13:07 (11 years ago)

Author:

sanmai

Message:

• Make port_number specified as command line parameter. For simplicity, there is no

default value anymore, for now.

File:

• monitoring/plugins/mpi/check_lat_oai_endpoint.py (modified) (2 diffs)

monitoring/plugins/mpi/check_lat_oai_endpoint.py

@@ -9 +9 @@
 OAI_namespace = "http://www.openarchives.org/OAI/2.0/"
 command_line_parameters = [("-h", "host",),
-                           ("-u", "http_path",)]
+                           ("-u", "http_path",),
+                           ("-p", "port_number",)]
 
-# Warning: check of validity of returned data relies on the XML namespace OAI_NAMESPACE of the returned XML markup.
 
 def special_main_subroutine(host, 
-                            http_path) :
+                            http_path,
+                            port_number) : 
 
     http_paths = (http_path,) # X- use frozenset
 
+    ## Warning: check of validity of returned data relies on the XML namespace OAI_NAMESPACE of the returned XML markup.
     valid_root_element_tag  = "{%s}OAI-PMH" % (OAI_namespace)
     
-    if host.count(':') == 1:
-        host, port = host.split(':')
-    else:
-        port = 80
-    # Check status for all http_paths.
+    ## Check status for all http_paths.
     results = \
         map(lambda http_path : generic_tla_monitoring.check_condition(host                      = host,
                                                                       http_path                 = http_path,
                                                                       HTTP_method               = 'GET',
-                                                                      port_number               = port,
+                                                                      port_number               = port_number,
                                                                       authorize                 = True,
                                                                       validator                 = generic_tla_monitoring.check_XML_validity,
@@ -36 +34 @@
             http_paths)   
     
-    generic_tla_monitoring.nagios_return_complex(results, reporter = special_plugin_description)
+    generic_tla_monitoring.nagios_return_complex(results, 
+                                                 reporter = special_plugin_description)
 
 if __name__ == "__main__" :