Changeset 4049 for monitoring

Timestamp:

11/19/13 13:04:40 (11 years ago)

Author:

sanmai

Message:

• Fix infinite loop in case of HTTP redirect to itself.

File:

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

monitoring/plugins/mpi/generic_tla_monitoring.py

@@ -288 +288 @@
     
     try :
-        conn = httplib.HTTPConnection(host = host, port = port_number) # X- accomodate https?
-
-        request = conn.request(HTTP_method, http_path)
+        conn = httplib.HTTPConnection(host = host, 
+                                      port = port_number
+                                      strict = True) # X- accomodate https?
+
+        request = conn.request(HTTP_method, 
+                               http_path)
     except :
         traceback_string = traceback.format_exc()
@@ -323 +326 @@
             # 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     = http_path, 
                                         **validator_arguments) # ['validator_arguments'])
@@ -344 +347 @@
 
                
-
-                return check_condition(host        = parsed_new_location_URL.netloc, 
-                                       http_path   = parsed_new_location_URL.path, 
-                                       HTTP_method = HTTP_method, 
-                                       port_number = port_number, 
-                                       authorize   = authorize,
-                                       validator   = validator, 
-                                       **validator_arguments) # special_plugin_file_name = validator_arguments['special_plugin_file_name']
+                if host == parsed_new_location_URL and http_path == parsed_new_location_URL :
+                    return {
+                              "code"      : "CRITICAL", 
+                              "message"   : 'Host %s is up but the response to GET "%s" implies an infinite redirection (to "%s").' % (host, http_path)
+                            }
+
+                else :  
+
+                    return check_condition(host        = parsed_new_location_URL.netloc, 
+                                           http_path   = parsed_new_location_URL.path, 
+                                           HTTP_method = HTTP_method, 
+                                           port_number = port_number, 
+                                           authorize   = authorize,
+                                           validator   = validator, 
+                                           **validator_arguments) # special_plugin_file_name = validator_arguments['special_plugin_file_name']
 
             elif response.status == httplib.UNAUTHORIZED and authorize == False :