static int spontaneous_flush_periods=100000;
static int max_separated_periods=2000;
static int need_activity_periods=1000;
-static int recentact_thresh=3;
-static int recentact_periods=1000;
+static int lowvol_thresh=3;
+static int lowvol_periods=1000;
static double max_bad_data_ratio= 1; /* conv'd from percentage by main */
static int max_bad_data_initial= 30;
static char *path_lock, *path_flushing, *path_defer, *path_dump;
static char *globpat_backlog;
static pid_t self_pid;
-static int *recentact_perperiod;
-static int recentact_circptr;
-static int recentact_total;
+static int *lowvol_perperiod;
+static int lowvol_circptr;
+static int lowvol_total;
/* statemc_init initialises */
static StateMachineState sms;
static void check_idle_conns(void) {
Conn *conn;
- int veryrecentact= recentact_perperiod[recentact_circptr];
- recentact_circptr++;
- recentact_circptr %= recentact_periods;
- recentact_total -= recentact_perperiod[recentact_circptr];
- recentact_perperiod[recentact_circptr]= 0;
+ int verylowvol= lowvol_perperiod[lowvol_circptr];
+ lowvol_circptr++;
+ lowvol_circptr %= lowvol_periods;
+ lowvol_total -= lowvol_perperiod[lowvol_circptr];
+ lowvol_perperiod[lowvol_circptr]= 0;
FOR_CONN(conn)
conn->since_activity++;
}
conn= LIST_HEAD(conns);
- if (!veryrecentact &&
+ if (!verylowvol &&
conns.count==1 &&
- recentact_total+veryrecentact < recentact_thresh &&
+ lowvol_total+verylowvol < lowvol_thresh &&
!conn_busy(conn))
conn_idle_close(conn, "low volume");
}
static int connecting_fdpass_sock;
static void connect_attempt_discard(void) {
- reconnect_blocking_event();
if (connecting_child) {
int status= xwaitpid(&connecting_child, "connect");
if (!(WIFEXITED(status) ||
x:
conn_dispose(conn);
connect_attempt_discard();
+ reconnect_blocking_event();
return OOP_CONTINUE;
}
assert(!connecting_fdpass_sock);
info("starting connection attempt");
+ int ok_reconnect_delay_periods= reconnect_delay_periods;
reconnect_blocking_event();
int socks[2];
connecting_fdpass_sock= socks[0];
xsetnonblock(connecting_fdpass_sock, 1);
on_fd_read_except(connecting_fdpass_sock, connchild_event);
+
+ if (!conns.count)
+ reconnect_delay_periods= ok_reconnect_delay_periods;
}
/*---------- assigning articles to conns, and transmitting ----------*/
Article *art= dequeue(0);
if (!art) break;
LIST_ADDTAIL(use->waiting, art);
- recentact_perperiod[recentact_circptr]++;
+ lowvol_perperiod[lowvol_circptr]++;
spare--;
}
conn_maybe_write(use);
{0,"max-flush-interval", "PERIOD", &spontaneous_flush_periods,op_seconds },
{0,"flush-finish-timeout", "PERIOD", &max_separated_periods, op_seconds },
{0,"idle-timeout", "PERIOD", &need_activity_periods, op_seconds },
-{0,"low-volume-thresh", "PERIOD", &recentact_thresh, op_integer },
-{0,"low-volume-window", "PERIOD", &recentact_periods, op_seconds },
+{0,"low-volume-thresh", "PERIOD", &lowvol_thresh, op_integer },
+{0,"low-volume-window", "PERIOD", &lowvol_periods, op_seconds },
{0,"max-bad-input-data-ratio","PERCENT", &max_bad_data_ratio, op_double },
{0,"max-bad-input-data-init", "PERCENT", &max_bad_data_initial, op_integer },
convert_to_periods_rndup(&spontaneous_flush_periods);
convert_to_periods_rndup(&max_separated_periods);
convert_to_periods_rndup(&need_activity_periods);
- convert_to_periods_rndup(&recentact_periods);
+ convert_to_periods_rndup(&lowvol_periods);
if (max_bad_data_ratio < 0 || max_bad_data_ratio > 100)
badusage("bad input data ratio must be between 0..100");
badusage("feed filename may not contain metacharacter %c",c);
int i;
- recentact_perperiod= xcalloc(sizeof(*recentact_perperiod),recentact_periods);
- for (i=0; i<recentact_periods; i++) {
- recentact_perperiod[i]= recentact_thresh;
- recentact_total += recentact_thresh;
+ lowvol_perperiod= xcalloc(sizeof(*lowvol_perperiod), lowvol_periods);
+ for (i=0; i<lowvol_periods; i++) {
+ lowvol_perperiod[i]= lowvol_thresh;
+ lowvol_total += lowvol_thresh;
}
/* set things up */