Ticket #1038: lighttpd-proxy-core.disable-time.patch

src/mod_proxy_core.c

@@ -40 +40 @@
 #define CONFIG_PROXY_CORE_MAX_POOL_SIZE    PROXY_CORE ".max-pool-size"
 #define CONFIG_PROXY_CORE_CHECK_LOCAL      PROXY_CORE ".check-local"
 #define CONFIG_PROXY_CORE_SPLIT_HOSTNAMES  PROXY_CORE ".split-hostnames"
+#define CONFIG_PROXY_CORE_DISABLE_TIME     PROXY_CORE ".disable-time"
 
 static int mod_proxy_wakeup_connections(server *srv, plugin_data *p, plugin_config *p_conf);
 
@@ -268 +269 @@
                 { CONFIG_PROXY_CORE_CHECK_LOCAL, NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION },        /* 9 */
                 { CONFIG_PROXY_CORE_MAX_KEEP_ALIVE, NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },       /* 10 */
                 { CONFIG_PROXY_CORE_SPLIT_HOSTNAMES, NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION },    /* 11 */
+                { CONFIG_PROXY_CORE_DISABLE_TIME, NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },         /* 12 */
                 { NULL,                        NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
         };
 
@@ -295 +297 @@
                 s->check_local = 0;
                 s->split_hostnames = 1;
                 s->max_keep_alive_requests = 0;
+                s->disable_time = 60;
 
                 cv[0].destination = p->backends_arr;
                 cv[1].destination = &(s->debug);
@@ -306 +309 @@
                 cv[9].destination = &(s->check_local);
                 cv[10].destination = &(s->max_keep_alive_requests);
                 cv[11].destination = &(s->split_hostnames);
+                cv[12].destination = &(s->disable_time);
 
                 buffer_reset(p->balance_buf);
 
@@ -1342 +1346 @@
                         return HANDLER_WAIT_FOR_FD;
                 case HANDLER_ERROR:
                         /* there is no-one on the other side */
-                        sess->proxy_con->address->disabled_until = srv->cur_ts + 60;
-
-                        TRACE("connecting to address %s (%p) failed, disabling for 60 sec", 
+                        sess->proxy_con->address->disabled_until = srv->cur_ts + p->conf.disable_time;
+                        
+      
+                        TRACE("connecting to address %s (%p) failed, disabling for %d sec", 
                                         BUF_STR(sess->proxy_con->address->name),
-                                        sess->proxy_con->address);
+                                        sess->proxy_con->address,
+                                        p->conf.disable_time );
+          
                         COUNTER_INC(sess->proxy_backend->requests_failed);
 
                         sess->proxy_con->address->state = PROXY_ADDRESS_STATE_DISABLED;
@@ -1390 +1397 @@
                                         break;
                                 case EHOSTUNREACH:
                                         /* there is no-one on the other side */
-                                        sess->proxy_con->address->disabled_until = srv->cur_ts + 60;
+                                        sess->proxy_con->address->disabled_until = srv->cur_ts + p->conf.disable_time;
 
-                                        TRACE("host %s is unreachable, disabling for 60 sec", sess->proxy_con->address->name->ptr);
+                                        TRACE("host %s is unreachable, disabling for %d sec", sess->proxy_con->address->name->ptr, p->conf.disable_time);
                                         break;
                                 default:
-                                        sess->proxy_con->address->disabled_until = srv->cur_ts + 60;
+                                        sess->proxy_con->address->disabled_until = srv->cur_ts + p->conf.disable_time;
 
                                         TRACE("connected finally failed: %s (%d)", strerror(socket_error), socket_error);
 
-                                        TRACE("connect to address %s failed and I don't know why, disabling for 10 sec", sess->proxy_con->address->name->ptr);
+                                        TRACE("connect to address %s failed and I don't know why, disabling for %d sec", sess->proxy_con->address->name->ptr, p->conf.disable_time);
 
                                         break;
                                 }
@@ -1904 +1911 @@
         PATCH_OPTION(check_local);
         PATCH_OPTION(split_hostnames);
         PATCH_OPTION(max_keep_alive_requests);
+        PATCH_OPTION(disable_time);
 
         /* skip the first, the global context */
         for (i = 1; i < srv->config_context->used; i++) {
@@ -1943 +1951 @@
                                 PATCH_OPTION(split_hostnames);
                         } else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_PROXY_CORE_MAX_KEEP_ALIVE))) {
                                 PATCH_OPTION(max_keep_alive_requests);
+                        } else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_PROXY_CORE_DISABLE_TIME))) {
+                                PATCH_OPTION(disable_time);
                         }
                 }
         }

src/mod_proxy_core.h

@@ -32 +32 @@
         unsigned short check_local;
         unsigned short split_hostnames;
         unsigned short max_keep_alive_requests;
+        unsigned short disable_time;
 
         proxy_balance_t balancer;
         struct proxy_protocol *protocol;