Add NEWS file

[mod-vhost-ldap.git] / mod_vhost_ldap.c

diff --git a/mod_vhost_ldap.c b/mod_vhost_ldap.c
index d7677c89002347a4c179c9621af194f1a44bbc56..cf89f8407fab47dfa0993c29cf114064ccbd66ba 100644 (file)
--- a/mod_vhost_ldap.c
+++ b/mod_vhost_ldap.c
@@ -50,6 +50,8 @@
 #define MIN_UID 100
 #define MIN_GID 100
 
+#define MAX_FAILURES 5
+
 module AP_MODULE_DECLARE_DATA vhost_ldap_module;
 
 typedef enum {
@@ -468,7 +470,9 @@ static int mod_vhost_ldap_translate_name(request_rec *r)
     char *cgi;
     const char *hostname = NULL;
     int is_fallback = 0;
-    int sleep = 0;
+    int sleep0 = 0;
+    int sleep1 = 1;
+    int sleep;
 
     reqc =
        (mod_vhost_ldap_request_t *)apr_pcalloc(r->pool, sizeof(mod_vhost_ldap_request_t));
@@ -499,7 +503,7 @@ start_over:
 fallback:
 
     ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
-                 "[mod_vhost_ldap.c]: translating hostname [%s], uri [%s], try [%d]", hostname, r->uri, failures);
+                 "[mod_vhost_ldap.c]: translating hostname [%s], uri [%s]", hostname, r->uri);
 
     apr_snprintf(filtbuf, FILTER_LENGTH, "(&(%s)(|(apacheServerName=%s)(apacheServerAlias=%s)))", conf->filter, hostname, hostname);
 
@@ -512,10 +516,14 @@ fallback:
     if (AP_LDAP_IS_SERVER_DOWN(result) ||
        (result == LDAP_TIMEOUT) ||
        (result == LDAP_CONNECT_ERROR)) {
-        if (failures++ <= 5) {
+        sleep = sleep0 + sleep1;
+        ap_log_rerror(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, r,
+                     "[mod_vhost_ldap.c]: lookup failure, retry number #[%d], sleeping for [%d] seconds", failures, sleep);
+        if (failures++ < MAX_FAILURES) {
            /* Back-off exponentially */
            apr_sleep(apr_time_from_sec(sleep));
-           sleep = sleep+failures;
+           sleep0 = sleep1;
+           sleep1 = sleep;
             goto start_over;
         } else {
            return HTTP_GATEWAY_TIME_OUT;