/*
- * TODO
- * - actually implement badusage
- * - options for all options
- * - manpage
- * - pid, sitename, hostname in lockfile
- * - -k kill mode ?
+ * todo
+ * - actually do something with readable on control master
+ * - option for realsockdir
+ * - manpage: document control master stuff
+ * - manpage: innconf is used for communicating with innd
+ * - debug this:
+ * build-lfs/backends/innduct --no-daemon -f `pwd`/fee sit dom
*/
/*
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/socket.h>
+#include <sys/un.h>
#include <unistd.h>
#include <string.h>
#include <signal.h>
#include <stdarg.h>
#include <assert.h>
#include <stdlib.h>
+#include <stddef.h>
#include <glob.h>
#include <time.h>
#include <math.h>
/*----- general definitions, probably best not changed -----*/
-#define CONNCHILD_ESTATUS_STREAM 4
-#define CONNCHILD_ESTATUS_NOSTREAM 5
+#define CONNCHILD_ESTATUS_STREAM 24
+#define CONNCHILD_ESTATUS_NOSTREAM 25
-#define INNDCOMMCHILD_ESTATUS_FAIL 6
-#define INNDCOMMCHILD_ESTATUS_NONESUCH 7
+#define INNDCOMMCHILD_ESTATUS_FAIL 26
+#define INNDCOMMCHILD_ESTATUS_NONESUCH 27
#define MAX_LINE_FEEDFILE (NNTP_MSGID_MAXLEN + sizeof(TOKEN)*2 + 10)
+#define MAX_CONTROL_COMMAND 1000
#define VA va_list al; va_start(al,fmt)
#define PRINTF(f,a) __attribute__((__format__(printf,f,a)))
static oop_rd_call peer_rd_err, peer_rd_ok;
/*----- configuration options -----*/
+/* when changing defaults, remember to update the manpage */
+
+static const char *sitename, *remote_host;
+static const char *feedfile, *realsockdir="/tmp/innduct.control";
+static int quiet_multiple=0;
+static int become_daemon=1;
+static int try_stream=1;
+static int port=119;
+static const char *inndconffile;
-static const char *sitename, *feedfile, *pathoutgoing;
-static const char *remote_host;
-static int quiet_multiple=0, become_daemon=1;
-
-static int max_connections=10, max_queue_per_conn=200;
+static int max_connections=10;
+static int max_queue_per_conn=200;
static int target_max_feedfile_size=100000;
-
static int period_seconds=60;
-static double max_bad_data_ratio= 0.01;
+static int connection_setup_timeout=200;
+static int inndcomm_flush_timeout=100;
+
+static double nocheck_thresh= 95.0; /* converted from percentage by main */
+static double nocheck_decay= 100; /* conv'd from articles to lambda by main */
+
+/* all these are initialised to seconds, and converted to periods in main */
+static int reconnect_delay_periods=1000;
+static int flushfail_retry_periods=1000;
+static int backlog_retry_minperiods=50;
+static int backlog_spontrescan_periods=300;
+static int spontaneous_flush_periods=100000;
+static int need_activity_periods=1000;
+
+static double max_bad_data_ratio= 1; /* conv'd from percentage by main */
static int max_bad_data_initial= 30;
/* in one corrupt 4096-byte block the number of newlines has
* mean 16 and standard deviation 3.99. 30 corresponds to z=+3.5 */
-static int connection_setup_timeout=200, port=119, try_stream=1;
-static int inndcomm_flush_timeout=100;
-static int reconnect_delay_periods, flushfail_retry_periods;
-static int backlog_retry_minperiods, backlog_spontaneous_rescan_periods;
-static int spontaneous_flush_periods, need_activity_periods;
-static const char *inndconffile;
-
-static double nocheck_thresh_pct= 95.0;
-static double nocheck_thresh; /* computed in main from _pct */
-static double nocheck_decay_articles= 100; /* converted to _decay */
-static double nocheck_decay; /* computed in main from _articles */
-
/*----- statistics -----*/
static oop_source *loop;
static ConnList conns;
static ArticleList queue;
-static char *path_lock, *path_flushing, *path_defer, *globpat_backlog;
+static char *path_lock, *path_flushing, *path_defer, *path_control;
+static char *globpat_backlog;
+static pid_t self_pid;
/* statemc_init initialises */
static StateMachineState sms;
if (become_daemon) {
vsyslog(sysloglevel,fmt,al);
} else {
+ if (self_pid) fprintf(stderr,"[%lu] ",(unsigned long)self_pid);
vfprintf(stderr,fmt,al);
putc('\n',stderr);
}
logwrap(syswarn, " warning", LOG_WARNING, errno);
logwrap(warn, " warning", LOG_WARNING, -1);
-logwrap(notice, "", LOG_NOTICE, -1);
+logwrap(notice, " notice", LOG_NOTICE, -1);
logwrap(info, " info", LOG_INFO, -1);
logwrap(debug, " debug", LOG_DEBUG, -1);
}
static int close_perhaps(int *fd) {
- if (!*fd) return 0;
+ if (*fd <= 0) return 0;
int r= close(*fd);
*fd=0;
return r;
if (r) sysdie("close %s%s",what,what2?what2:"");
}
static void xclose_perhaps(int *fd, const char *what, const char *what2) {
- if (!*fd) return;
+ if (*fd <= 0) return;
xclose(*fd,what,what2);
*fd=0;
}
pid_t child;
child= fork();
- if (child==-1) sysdie("cannot fork for %s",what);
+ if (child==-1) sysfatal("cannot fork for %s",what);
debug("forked %s %ld", what, (unsigned long)child);
if (!child) postfork();
return child;
return now;
}
+static void xsetnonblock(int fd, int nonblocking) {
+ int errnoval= oop_fd_nonblock(fd, nonblocking);
+ if (errnoval) { errno= errnoval; sysdie("setnonblocking"); }
+}
+
static void check_isreg(const struct stat *stab, const char *path,
const char *what) {
if (!S_ISREG(stab->st_mode))
return errnoval==EWOULDBLOCK || errnoval==EAGAIN;
}
+
+/*========== command and control connections ==========*/
+
+static int control_master;
+
+typedef struct ControlConn ControlConn;
+struct ControlConn {
+ void (*destroy)(ControlConn*);
+ int fd;
+ oop_read *rd;
+ FILE *out;
+ union {
+ struct sockaddr sa;
+ struct sockaddr_un un;
+ } sa;
+ socklen_t salen;
+};
+
+static const oop_rd_style control_rd_style= {
+ OOP_RD_DELIM_STRIP, '\n',
+ OOP_RD_NUL_FORBID,
+ OOP_RD_SHORTREC_FORBID
+};
+
+static void control_destroy(ControlConn *cc) {
+ cc->destroy(cc);
+}
+
+static void control_checkouterr(ControlConn *cc /* may destroy*/) {
+ if (ferror(cc->out) | fflush(cc->out)) {
+ info("CTRL%d write error %s", cc->fd, strerror(errno));
+ control_destroy(cc);
+ }
+}
+
+static void control_prompt(ControlConn *cc /* may destroy*/) {
+ fprintf(cc->out, "%s|", sitename);
+ control_checkouterr(cc);
+}
+
+typedef struct ControlCommand ControlCommand;
+struct ControlCommand {
+ const char *cmd;
+ void (*f)(ControlConn *cc, const ControlCommand *ccmd,
+ const char *arg, size_t argsz);
+};
+
+static const ControlCommand control_commands[];
+
+static void ccmd_help(ControlConn *cc, const ControlCommand *thisccmd,
+ const char *arg, size_t argsz) {
+ fputs("commands:\n", cc->out);
+ const ControlCommand *ccmd;
+ for (ccmd=control_commands; ccmd->cmd; ccmd++)
+ fprintf(cc->out, " %s\n", ccmd->cmd);
+}
+
+static const ControlCommand control_commands[]= {
+ { "h", ccmd_help },
+ { 0 }
+};
+
+static void *control_rd_ok(oop_source *lp, oop_read *oread, oop_rd_event ev,
+ const char *errmsg, int errnoval,
+ const char *data, size_t recsz, void *cc_v) {
+ ControlConn *cc= cc_v;
+
+ if (!data) {
+ info("CTRL%d closed", cc->fd);
+ cc->destroy(cc);
+ return OOP_CONTINUE;
+ }
+
+ if (recsz == 0) goto prompt;
+
+ const ControlCommand *ccmd;
+ for (ccmd=control_commands; ccmd->cmd; ccmd++) {
+ int l= strlen(ccmd->cmd);
+ if (recsz < l) continue;
+ if (recsz > l && data[l] != ' ') continue;
+ if (memcmp(data, ccmd->cmd, l)) continue;
+
+ int argl= (int)recsz - (l+1);
+ ccmd->f(cc, ccmd, argl>=0 ? data : 0, argl);
+ goto prompt;
+ }
+
+ fputs("unknown command; h for help\n", cc->out);
+
+ prompt:
+ control_prompt(cc);
+ return OOP_CONTINUE;
+}
+
+static void *control_rd_err(oop_source *lp, oop_read *oread, oop_rd_event ev,
+ const char *errmsg, int errnoval,
+ const char *data, size_t recsz, void *cc_v) {
+ ControlConn *cc= cc_v;
+
+ info("CTRL%d read error %s", cc->fd, errmsg);
+ cc->destroy(cc);
+ return OOP_CONTINUE;
+}
+
+static int control_conn_startup(ControlConn *cc /* may destroy*/,
+ const char *how) {
+ cc->rd= oop_rd_new_fd(loop, cc->fd, 0,0);
+ if (!cc->rd) { warn("oop_rd_new_fd control failed"); return -1; }
+
+ int er= oop_rd_read(cc->rd, &control_rd_style, MAX_CONTROL_COMMAND,
+ control_rd_ok, cc,
+ control_rd_err, cc);
+ if (er) { errno= er; syswarn("oop_rd_read control failed"); return -1; }
+
+ info("CTRL%d %s ready", cc->fd, how);
+ control_prompt(cc);
+ return 0;
+}
+
+static void control_stdio_destroy(ControlConn *cc) {
+ if (cc->rd) {
+ oop_rd_cancel(cc->rd);
+ errno= oop_rd_delete_tidy(cc->rd);
+ if (errno) syswarn("oop_rd_delete tidy failed (no-nonblock stdin?)");
+ }
+ free(cc);
+}
+
+static void control_stdio(void) {
+ ControlConn *cc= xmalloc(sizeof(*cc));
+ memset(cc,0,sizeof(*cc));
+ cc->destroy= control_stdio_destroy;
+
+ cc->fd= 0;
+ cc->out= stdout;
+ int r= control_conn_startup(cc,"stdio");
+ if (r) cc->destroy(cc);
+}
+
+static void control_accepted_destroy(ControlConn *cc) {
+ if (cc->rd) {
+ oop_rd_cancel(cc->rd);
+ oop_rd_delete_kill(cc->rd);
+ }
+ if (cc->out) { fclose(cc->out); cc->fd=0; }
+ close_perhaps(&cc->fd);
+ free(cc);
+}
+
+static void *control_master_readable(oop_source *lp, int master,
+ oop_event ev, void *u) {
+ ControlConn *cc= xmalloc(sizeof(*cc));
+ memset(cc,0,sizeof(*cc));
+ cc->destroy= control_accepted_destroy;
+
+ cc->salen= sizeof(cc->sa);
+ cc->fd= accept(master, &cc->sa.sa, &cc->salen);
+ if (cc->fd<0) { syswarn("error accepting control connection"); goto x; }
+
+ cc->out= fdopen(cc->fd, "w");
+ if (!cc->out) { syswarn("error fdopening accepted control conn"); goto x; }
+
+ int r= control_conn_startup(cc, "accepted");
+ if (r) goto x;
+
+ return OOP_CONTINUE;
+
+ x:
+ cc->destroy(cc);
+ return OOP_CONTINUE;
+}
+
+#define NOCONTROL(...) do{ \
+ syswarn("no control socket, because failed to " __VA_ARGS__); \
+ goto nocontrol; \
+ }while(0)
+
+static void control_init(void) {
+ char *real=0;
+
+ union {
+ struct sockaddr sa;
+ struct sockaddr_un un;
+ } sa;
+
+ memset(&sa,0,sizeof(sa));
+ int maxlen= sizeof(sa.un.sun_path);
+
+ int reallen= readlink(path_control, sa.un.sun_path, maxlen);
+ if (reallen<0) {
+ if (errno != ENOENT)
+ NOCONTROL("readlink control socket symlink path %s", path_control);
+ }
+ if (reallen >= maxlen) {
+ debug("control socket symlink path too long (r=%d)",reallen);
+ xunlink(path_control, "old (overlong) control socket symlink");
+ reallen= -1;
+ }
+
+ if (reallen<0) {
+ struct stat stab;
+ int r= lstat(realsockdir,&stab);
+ if (r) {
+ if (errno != ENOENT) NOCONTROL("lstat real socket dir %s", realsockdir);
+
+ r= mkdir(realsockdir, 0700);
+ if (r) NOCONTROL("mkdir real socket dir %s", realsockdir);
+
+ } else {
+ uid_t self= geteuid();
+ if (!S_ISDIR(stab.st_mode) ||
+ stab.st_uid != self ||
+ stab.st_mode & 0077) {
+ warn("no control socket, because real socket directory"
+ " is somehow wrong (ISDIR=%d, uid=%lu (exp.%lu), mode %lo)",
+ !!S_ISDIR(stab.st_mode),
+ (unsigned long)stab.st_uid, (unsigned long)self,
+ (unsigned long)stab.st_mode & 0777UL);
+ goto nocontrol;
+ }
+ }
+
+ real= xasprintf("%s/s%lx.%lx", realsockdir,
+ (unsigned long)xtime(), (unsigned long)self_pid);
+ int reallen= strlen(real);
+
+ if (reallen >= maxlen) {
+ warn("no control socket, because tmpnam gave overly-long path"
+ " %s", real);
+ goto nocontrol;
+ }
+ r= symlink(real, path_control);
+ if (r) NOCONTROL("make control socket path %s a symlink to real"
+ " socket path %s", path_control, real);
+ memcpy(sa.un.sun_path, real, reallen);
+ }
+
+ int r= unlink(sa.un.sun_path);
+ if (r && errno!=ENOENT)
+ NOCONTROL("remove old real socket %s", sa.un.sun_path);
+
+ control_master= socket(PF_UNIX, SOCK_STREAM, 0);
+ if (control_master<0) NOCONTROL("create new control socket");
+
+ sa.un.sun_family= AF_UNIX;
+ int sl= strlen(sa.un.sun_path) + offsetof(struct sockaddr_un, sun_path);
+ r= bind(control_master, &sa.sa, sl);
+ if (r) NOCONTROL("bind to real socket path %s", sa.un.sun_path);
+
+ r= listen(control_master, 5);
+ if (r) NOCONTROL("listen");
+
+ xsetnonblock(control_master, 1);
+
+ loop->on_fd(loop, control_master, OOP_READ, control_master_readable, 0);
+ info("control socket ok, real path %s", sa.un.sun_path);
+
+ return;
+
+ nocontrol:
+ free(real);
+ xclose_perhaps(&control_master, "control master",0);
+ return;
+}
+
/*========== management of connections ==========*/
static void conn_closefd(Conn *conn, const char *msgprefix) {
loop->on_fd(loop, conn->fd, OOP_EXCEPTION, conn_exception, conn);
conn->rd= oop_rd_new_fd(loop,conn->fd, 0, 0); /* sets nonblocking, too */
- if (!conn->fd) sysdie("oop_rd_new_fd (fd=%d)",conn->fd);
+ if (!conn->fd) die("oop_rd_new_fd conn failed (fd=%d)",conn->fd);
int r= oop_rd_read(conn->rd, &peer_rd_style, NNTP_STRLEN,
&peer_rd_ok, conn,
&peer_rd_err, conn);
static void filemon_method_startfile(InputFile *ipf, Filemon_Perfile *pf) {
int wd= inotify_add_watch(filemon_inotify_fd, ipf->path, IN_MODIFY);
- if (wd < 0) sysdie("inotify_add_watch %s", ipf->path);
+ if (wd < 0) sysfatal("inotify_add_watch %s", ipf->path);
if (wd >= filemon_inotify_wdmax) {
int newmax= wd+2;
inputfile_reading_start(f);
}
-static void statemc_init(void) {
+static void statemc_lock(void) {
+ int lockfd;
struct stat stab, stabf;
-
- path_lock= xasprintf("%s_lock", feedfile);
- path_flushing= xasprintf("%s_flushing", feedfile);
- path_defer= xasprintf("%s_defer", feedfile);
- globpat_backlog= xasprintf("%s_backlog*", feedfile);
-
+
for (;;) {
- int lockfd= open(path_lock, O_CREAT|O_RDWR, 0600);
+ lockfd= open(path_lock, O_CREAT|O_RDWR, 0600);
if (lockfd<0) sysfatal("open lockfile %s", path_lock);
struct flock fl;
if (quiet_multiple) exit(0);
fatal("another duct holds the lockfile");
}
- sysdie("fcntl F_SETLK lockfile %s", path_lock);
+ sysfatal("fcntl F_SETLK lockfile %s", path_lock);
}
xfstat_isreg(lockfd, &stabf, path_lock, "lockfile");
xclose(lockfd, "stale lockfile ", path_lock);
}
+
+ FILE *lockfile= fdopen(lockfd, "w");
+ if (!lockfile) sysdie("fdopen lockfile");
+
+ int r= ftruncate(lockfd, 0);
+ if (r) sysdie("truncate lockfile to write new info");
+
+ if (fprintf(lockfile, "pid %ld\nsite %s\nfeedfile %s\nfqdn %s\n",
+ (unsigned long)self_pid,
+ sitename, feedfile, remote_host) == EOF ||
+ fflush(lockfile))
+ sysfatal("write info to lockfile %s", path_lock);
+
debug("startup: locked");
+}
+
+static void statemc_init(void) {
+ struct stat stabdefer;
search_backlog_file();
int defer_noent;
- xlstat_isreg(path_defer, &stab, &defer_noent, "defer file");
+ xlstat_isreg(path_defer, &stabdefer, &defer_noent, "defer file");
if (defer_noent) {
debug("startup: ductdefer ENOENT");
} else {
- debug("startup: ductdefer nlink=%ld", (long)stab.st_nlink);
- switch (stab.st_nlink==1) {
+ debug("startup: ductdefer nlink=%ld", (long)stabdefer.st_nlink);
+ switch (stabdefer.st_nlink==1) {
case 1:
open_defer(); /* so that we will later close it and rename it */
break;
break;
default:
die("defer file %s has unexpected link count %d",
- path_defer, stab.st_nlink);
+ path_defer, stabdefer.st_nlink);
}
}
sm_period_counter);
int r= link(feedfile, path_flushing);
- if (r) sysdie("link feedfile %s to flushing file %s",
- feedfile, path_flushing);
+ if (r) sysfatal("link feedfile %s to flushing file %s",
+ feedfile, path_flushing);
/* => Hardlinked */
xunlink(feedfile, "old feedfile link");
switch (r) {
case GLOB_ABORTED:
- sysdie("failed to expand backlog pattern %s", globpat_backlog);
+ sysfatal("failed to expand backlog pattern %s", globpat_backlog);
case GLOB_NOSPACE:
- die("out of memory expanding backlog pattern %s", globpat_backlog);
+ fatal("out of memory expanding backlog pattern %s", globpat_backlog);
case 0:
for (i=0; i<gl.gl_pathc; i++) {
const char *path= gl.gl_pathv[i];
if (sms==sm_DROPPED) {
notice("feed dropped and our work is complete");
xunlink(path_lock, "lockfile for old feed");
- exit(0);
+ exit(4);
}
- until_backlog_nextscan= backlog_spontaneous_rescan_periods;
+ until_backlog_nextscan= backlog_spontrescan_periods;
goto xfree;
}
until_backlog_nextscan= age_deficiency / period_seconds;
- if (backlog_spontaneous_rescan_periods >= 0 &&
- until_backlog_nextscan > backlog_spontaneous_rescan_periods)
- until_backlog_nextscan= backlog_spontaneous_rescan_periods;
+ if (backlog_spontrescan_periods >= 0 &&
+ until_backlog_nextscan > backlog_spontrescan_periods)
+ until_backlog_nextscan= backlog_spontrescan_periods;
debug("backlog scan: young age=%f deficiency=%ld nextscan=%d oldest=%s",
age, age_deficiency, until_backlog_nextscan, oldest_path);
assert(!inndcomm_child);
assert(!inndcomm_sentinel_fd);
- if (pipe(pipefds)) sysdie("create pipe for inndcomm child sentinel");
+ if (pipe(pipefds)) sysfatal("create pipe for inndcomm child sentinel");
inndcomm_child= xfork("inndcomm child");
}));
static char *debug_report_ipf(InputFile *ipf) {
- if (!ipf) return xasprintf("-");
+ if (!ipf) return xasprintf("none");
const char *slash= strrchr(ipf->path,'/');
const char *path= slash ? slash+1 : ipf->path;
debug("PERIOD"
" sms=%s[%d] conns=%d queue=%d until_connect=%d"
" input_files main:%s old:%s flushing:%s"
- " children connecting=%ld inndcomm_child=%ld"
+ " children connecting=%ld inndcomm=%ld"
,
sms_names[sms], sm_period_counter,
conns.count, queue.count, until_connect,
double v= strtod(val,&ep);
if (ep==val) badusage("bad time/duration value for %s",o->lng);
- if (!*ep || !strcmp(ep,"s")) unit= 1;
- else if (!strcmp(ep,"m")) unit= 60;
- else if (!strcmp(ep,"h")) unit= 3600;
- else if (!strcmp(ep,"d")) unit= 86400;
+ if (!*ep || !strcmp(ep,"s") || !strcmp(ep,"sec")) unit= 1;
+ else if (!strcmp(ep,"m") || !strcmp(ep,"min")) unit= 60;
+ else if (!strcmp(ep,"h") || !strcmp(ep,"hour")) unit= 3600;
+ else if (!strcmp(ep,"d") || !strcmp(ep,"day")) unit= 86400;
+ else if (!strcmp(ep,"das")) unit= 10;
+ else if (!strcmp(ep,"hs")) unit= 100;
+ else if (!strcmp(ep,"ks")) unit= 1000;
+ else if (!strcmp(ep,"Ms")) unit= 1000000;
else badusage("bad units %s for time/duration value for %s",ep,o->lng);
v *= unit;
*store= v;
}
-static void op_periods_rndup(const Option *o, const char *val) {
- int *store= o->store;
- op_seconds(o,val);
- *store += period_seconds-1;
- *store /= period_seconds;
-}
-
static void op_setint(const Option *o, const char *val) {
int *store= o->store;
*store= o->intval;
static void help(const Option *o, const char *val);
static const Option innduct_options[]= {
-{'f',"feedfile", "F", &feedfile, op_string },
-{'q',"quiet-multiple", 0, &quiet_multiple, op_setint, 1 },
-{0,"help", 0, help },
-
-{0,"max-connections", "N", &max_connections, op_integer },
-{0,"max-queue-per-conn", "N", &max_queue_per_conn, op_integer },
-
-
-{0,"streaming", 0, &try_stream, op_setint, 1 },
-{0,"no-streaming", 0, &try_stream, op_setint, 0 },
-{'P',"port", "PORT",&port, op_integer },
-{0,"inndconf", "F", &inndconffile, op_string },
-{0,"no-daemon", 0, &become_daemon, op_setint, 0 },
+{'f',"feedfile", "F", &feedfile, op_string },
+{'q',"quiet-multiple", 0, &quiet_multiple, op_setint, 1 },
+{0,"no-daemon", 0, &become_daemon, op_setint, 0 },
+{0,"no-streaming", 0, &try_stream, op_setint, 0 },
+{0,"inndconf", "F", &inndconffile, op_string },
+{'P',"port", "PORT", &port, op_integer },
+{0,"help", 0, 0, help },
+
+{0,"max-connections", "N", &max_connections, op_integer },
+{0,"max-queue-per-conn", "N", &max_queue_per_conn, op_integer },
+{0,"feedfile-flush-size","BYTES", &target_max_feedfile_size, op_integer },
+{0,"period-interval", "TIME", &period_seconds, op_seconds },
+
+{0,"connection-timeout", "TIME", &connection_setup_timeout, op_seconds },
+{0,"stuck-flush-timeout","TIME", &inndcomm_flush_timeout, op_seconds },
+
+{0,"no-check-proportion", "PERCENT", &nocheck_thresh, op_double },
+{0,"no-check-response-time","ARTICLES", &nocheck_decay, op_double },
+
+{0,"reconnect-interval", "PERIOD", &reconnect_delay_periods, op_seconds },
+{0,"flush-retry-interval", "PERIOD", &flushfail_retry_periods, op_seconds },
+{0,"earliest-deferred-retry","PERIOD", &backlog_retry_minperiods, op_seconds },
+{0,"backlog-rescan-interval","PERIOD",&backlog_spontrescan_periods,op_seconds},
+{0,"max-flush-interval", "PERIOD", &spontaneous_flush_periods,op_seconds },
+{0,"idle-timeout", "PERIOD", &need_activity_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 },
-{0,"no-check-proportion","PERCENT", &nocheck_thresh_pct, op_double },
-{0,"no-check-filter", "ARTICLES", &nocheck_decay_articles, op_double },
-
-{0,"reconnect-interval", "TIME", &reconnect_delay_periods, op_periods_rndup },
-{0,"flush-retry-interval","TIME", &flushfail_retry_periods, op_periods_rndup },
-{0,"inndcomm-timeout", "TIME", &inndcomm_flush_timeout, op_seconds },
{0,0}
};
exit(0);
}
+static void convert_to_periods_rndup(int *store) {
+ *store += period_seconds-1;
+ *store /= period_seconds;
+}
+
int main(int argc, char **argv) {
if (!argv[1]) {
printusage(stderr);
- exit(12);
+ exit(8);
}
parse_options(innduct_options, &argv);
if (!remote_host) remote_host= sitename;
- if (nocheck_thresh_pct < 0 || nocheck_thresh_pct > 100)
+ if (nocheck_thresh < 0 || nocheck_thresh > 100)
badusage("nocheck threshold percentage must be between 0..100");
- nocheck_thresh= nocheck_thresh_pct * 0.01;
+ nocheck_thresh *= 0.01;
- if (nocheck_decay_articles < 0.1)
+ if (nocheck_decay < 0.1)
badusage("nocheck decay articles must be at least 0.1");
- nocheck_decay= 1 - 1/nocheck_decay_articles;
-
- if (!pathoutgoing)
- pathoutgoing= innconf->pathoutgoing;
- innconf_read(inndconffile);
-
- if (!feedfile)
- feedfile= xasprintf("%s/%s",pathoutgoing,sitename);
- else if (!feedfile[0])
+ nocheck_decay= pow(0.5, 1.0/nocheck_decay);
+
+ convert_to_periods_rndup(&reconnect_delay_periods);
+ convert_to_periods_rndup(&flushfail_retry_periods);
+ convert_to_periods_rndup(&backlog_retry_minperiods);
+ convert_to_periods_rndup(&backlog_spontrescan_periods);
+ convert_to_periods_rndup(&spontaneous_flush_periods);
+ convert_to_periods_rndup(&need_activity_periods);
+
+ if (max_bad_data_ratio < 0 || max_bad_data_ratio > 100)
+ badusage("bad input data ratio must be between 0..100");
+ max_bad_data_ratio *= 0.01;
+
+ if (!feedfile) {
+ innconf_read(inndconffile);
+ feedfile= xasprintf("%s/%s",innconf->pathoutgoing,sitename);
+ } else if (!feedfile[0]) {
badusage("feed filename must be nonempty");
- else if (feedfile[strlen(feedfile)-1]=='/')
+ } else if (feedfile[strlen(feedfile)-1]=='/') {
feedfile= xasprintf("%s%s",feedfile,sitename);
+ }
const char *feedfile_forbidden= "?*[~#";
int c;
/* set things up */
+ path_lock= xasprintf("%s_lock", feedfile);
+ path_flushing= xasprintf("%s_flushing", feedfile);
+ path_defer= xasprintf("%s_defer", feedfile);
+ path_control= xasprintf("%s_control", feedfile);
+ globpat_backlog= xasprintf("%s_backlog*", feedfile);
+
oop_source_sys *sysloop= oop_sys_new();
if (!sysloop) sysdie("could not create liboop event loop");
loop= (oop_source*)sysloop;
openlog("innduct",LOG_NDELAY|LOG_PID,LOG_NEWS);
int null= open("/dev/null",O_RDWR);
- if (null<0) sysdie("failed to open /dev/null");
+ if (null<0) sysfatal("failed to open /dev/null");
dup2(null,0);
dup2(null,1);
dup2(null,2);
if (child1) _exit(0);
pid_t sid= setsid();
- if (sid != child1) sysdie("setsid failed");
+ if (sid != child1) sysfatal("setsid failed");
pid_t child2= xfork("daemonise second fork");
if (child2) _exit(0);
}
+ self_pid= getpid();
+ if (self_pid==-1) sysdie("getpid");
+
+ if (!become_daemon)
+ control_stdio();
+
+ statemc_lock();
+
notice("starting");
+ control_init();
+
if (!filemon_method_init()) {
warn("no file monitoring available, polling");
filepoll_schedule();
~ian / innduct.git / blobdiff