/*
* TODO
- * - close idle connections
- * - cope better with garbage in feed file
- * - cope better with NULs in feed file
+ * - make period size a tuneable
+ * - check all structs initialised
+ * - check all fd watches properly undone
+ * - check all init functions called
+ * - actually implement badusage
+ * - options for all options
+ * - manpage
+ * - pid, sitename, hostname in lockfile
* - -k kill mode ?
*/
/*============================== PROGRAM ==============================*/
-#define _GNU_SOURCE
+#define _GNU_SOURCE 1
-#include "inn/list.h"
#include "config.h"
#include "storage.h"
#include "nntp.h"
#include "libinn.h"
+#include "inndcomm.h"
+
+#include "inn/list.h"
+#include "inn/innconf.h"
#include <sys/uio.h>
#include <sys/types.h>
#include <stdarg.h>
#include <assert.h>
#include <stdlib.h>
+#include <glob.h>
+#include <time.h>
+#include <math.h>
#include <oop.h>
#include <oop-read.h>
#define INNDCOMMCHILD_ESTATUS_FAIL 6
#define INNDCOMMCHILD_ESTATUS_NONESUCH 7
+#define MAX_LINE_FEEDFILE (NNTP_MSGID_MAXLEN + sizeof(TOKEN)*2 + 10)
+
+#define VA va_list al; va_start(al,fmt)
+#define PRINTF(f,a) __attribute__((__format__(printf,f,a)))
+#define NORET_PRINTF(f,a) __attribute__((__noreturn__,__format__(printf,f,a)))
+
/*----- doubly linked lists -----*/
#define ISNODE(T) struct { T *succ, *pred; } node /* must be at start */
static void statemc_setstate(StateMachineState newsms, int periods,
const char *forlog, const char *why);
+static void statemc_start_flush(const char *why); /* Normal => Flushing */
+static void spawn_inndcomm_flush(const char *why); /* Moved => Flushing */
+
static void check_master_queue(void);
static void queue_check_input_done(void);
-static void statemc_start_flush(const char *why); /* Normal => Flushing */
static void statemc_check_flushing_done(void);
static void statemc_check_backlog_done(void);
static void postfork_inputfile(InputFile *ipf);
static void open_defer(void);
+static void close_defer(void);
+static void search_backlog_file(void);
static void inputfile_tailing_start(InputFile *ipf);
static void inputfile_tailing_stop(InputFile *ipf);
static void filemon_stop(InputFile *ipf);
static void filemon_callback(InputFile *ipf);
+static void vconnfail(Conn *conn, const char *fmt, va_list al) PRINTF(2,0);
+static void connfail(Conn *conn, const char *fmt, ...) PRINTF(2,3);
+
/*----- configuration options -----*/
-static char *sitename, *feedfile;
+static const char *sitename, *feedfile, *pathoutgoing;
static const char *remote_host;
static int quiet_multiple=0, become_daemon=1;
static int inndcomm_flush_timeout=100;
static int reconnect_delay_periods, flushfail_retry_periods, open_wait_periods;
static int backlog_retry_minperiods, backlog_spontaneous_rescan_periods;
+static int spontaneous_flush_periods, need_activity_periods;
static const char *inndconffile;
-static double accept_proportion;
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 */
-static int nocheck, nocheck_reported;
/*----- statistics -----*/
oop_read *rd;
long inprogress; /* no. of articles read but not processed */
off_t offset;
+ int skippinglong;
int counts[art_MaxState][RCI_max];
int readcount_ok, readcount_blank, readcount_err;
struct Conn {
ISNODE(Conn);
int fd, max_queue, stream, quitting;
+ int since_activity; /* periods */
ArticleList waiting; /* not yet told peer */
ArticleList priority; /* peer says send it now */
ArticleList sent; /* offered/transmitted - in xmit or waiting reply */
static ConnList conns;
static ArticleList queue;
-static char *path_lock, *path_flushing, *path_defer;
+static char *path_lock, *path_flushing, *path_defer, *globpat_backlog;
#define SMS(newstate, periods, why) \
(statemc_setstate(sm_##newstate,(periods),#newstate,(why)))
static StateMachineState sms;
static FILE *defer;
static InputFile *main_input_file, *flushing_input_file, *backlog_input_file;
-static int sm_period_counter;
+static int sm_period_counter, until_backlog_nextscan;
+static double accept_proportion;
+static int nocheck, nocheck_reported;
/*========== logging ==========*/
-static void logcore(int sysloglevel, const char *fmt, ...)
- __attribute__((__format__(printf,2,3)));
+static void logcore(int sysloglevel, const char *fmt, ...) PRINTF(2,3);
static void logcore(int sysloglevel, const char *fmt, ...) {
- va_list al;
- va_start(al,fmt);
+ VA;
if (become_daemon) {
vsyslog(sysloglevel,fmt,al);
} else {
}
static void logv(int sysloglevel, const char *pfx, int errnoval,
- int exitstatus, const char *fmt, va_list al)
- __attribute__((__format__(printf,5,0)));
+ const char *fmt, va_list al) PRINTF(5,0);
static void logv(int sysloglevel, const char *pfx, int errnoval,
- int exitstatus, const char *fmt, va_list al) {
+ const char *fmt, va_list al) {
char msgbuf[256]; /* NB do not call xvasprintf here or you'll recurse */
vsnprintf(msgbuf,sizeof(msgbuf), fmt,al);
msgbuf[sizeof(msgbuf)-1]= 0;
errnoval>=0 ? strerror(errnoval) : "");
}
-#define logwrap(fn, pfx, sysloglevel, err, estatus) \
- static void fn(const char *fmt, ...) \
- __attribute__((__format__(printf,1,2))); \
+#define diewrap(fn, pfx, sysloglevel, err, estatus) \
+ static void fn(const char *fmt, ...) NORET_PRINTF(1,2); \
+ static void fn(const char *fmt, ...) { \
+ VA; \
+ logv(sysloglevel, pfx, err, fmt, al); \
+ exit(estatus); \
+ }
+
+#define logwrap(fn, pfx, sysloglevel, err) \
+ static void fn(const char *fmt, ...) PRINTF(1,2); \
static void fn(const char *fmt, ...) { \
- va_list al; \
- va_start(al,fmt); \
- logv(sysloglevel, pfx, err, estatus, fmt, al); \
+ VA; \
+ logv(sysloglevel, pfx, err, fmt, al); \
+ va_end(al); \
}
-logwrap(sysdie, " critical", LOG_CRIT, errno, 16);
-logwrap(die, " critical", LOG_CRIT, -1, 16);
+diewrap(sysdie, " critical", LOG_CRIT, errno, 16);
+diewrap(die, " critical", LOG_CRIT, -1, 16);
-logwrap(sysfatal, " fatal", LOG_ERR, errno, 12);
-logwrap(fatal, " fatal", LOG_ERR, -1, 12);
+diewrap(sysfatal, " fatal", LOG_ERR, errno, 12);
+diewrap(fatal, " fatal", LOG_ERR, -1, 12);
-logwrap(syswarn, " warning", LOG_WARNING, errno, 0);
-logwrap(warn, " warning", LOG_WARNING, -1, 0);
+logwrap(syswarn, " warning", LOG_WARNING, errno);
+logwrap(warn, " warning", LOG_WARNING, -1);
-logwrap(notice, "", LOG_NOTICE, -1, 0);
-logwrap(info, " info", LOG_INFO, -1, 0);
-logwrap(debug, " debug", LOG_DEBUG, -1, 0);
+logwrap(notice, "", LOG_NOTICE, -1);
+logwrap(info, " info", LOG_INFO, -1);
+logwrap(debug, " debug", LOG_DEBUG, -1);
/*========== utility functions etc. ==========*/
-static char *xvasprintf(const char *fmt, va_list al)
- __attribute__((__format__(printf,1,0)));
+static char *xvasprintf(const char *fmt, va_list al) PRINTF(1,0);
static char *xvasprintf(const char *fmt, va_list al) {
char *str;
int rc= vasprintf(&str,fmt,al);
if (rc<0) sysdie("vasprintf(\"%s\",...) failed", fmt);
return str;
}
-static char *xasprintf(const char *fmt, ...)
- __attribute__((__format__(printf,1,2)));
+static char *xasprintf(const char *fmt, ...) PRINTF(1,2);
static char *xasprintf(const char *fmt, ...) {
- va_list al;
- va_start(al,fmt);
+ VA;
char *str= xvasprintf(fmt,al);
va_end(al);
return str;
if (r) sysdie("can't unlink %s %s", path, what);
}
+static time_t xtime(void) {
+ time_t now= time(0);
+ if (now==-1) sysdie("time(2) failed");
+}
+
static void check_isreg(const struct stat *stab, const char *path,
const char *what) {
if (!S_ISREG(stab->st_mode))
return sanibuf;
}
+static int isewouldblock(int errnoval) {
+ return errnoval==EWOULDBLOCK || errnoval==EAGAIN;
+}
+
/*========== making new connections ==========*/
static void conn_dispose(Conn *conn) {
connect_attempt_discard();
}
+static void check_idle_conns(void) {
+ Conn *conn;
+ for (conn=LIST_HEAD(conns); conn; conn=LIST_NEXT(conn))
+ conn->since_activity++;
+ search_again:
+ for (conn=LIST_HEAD(conns); conn; conn=LIST_NEXT(conn)) {
+ if (conn->since_activity <= need_activity_periods) continue;
+
+ /* We need to shut this down */
+ if (conn->quitting)
+ connfail(conn,"timed out waiting for response to QUIT");
+ else if (conn->sent.count)
+ connfail(conn,"timed out waiting for responses");
+ else if (conn->waiting.count || conn->priority.count)
+ connfail(conn,"BUG IN INNDUCT conn has queue but nothing sent");
+ else if (conn->xmitu)
+ connfail(conn,"peer has been sending responses"
+ " before receiving our commands!");
+ else {
+ static const char quitcmd[]= "QUIT\r\n";
+ int todo= sizeof(quitcmd)-1;
+ const char *p= quitcmd;
+ for (;;) {
+ int r= write(conn->fd, p, todo);
+ if (r<0) {
+ if (isewouldblock(errno))
+ connfail(conn, "blocked writing QUIT to idle connection");
+ else
+ connfail(conn, "failed to write QUIT to idle connection: %s",
+ strerror(errno));
+ break;
+ }
+ assert(r<=todo);
+ todo -= r;
+ if (!todo) {
+ conn->quitting= 1;
+ conn->since_activity= 0;
+ debug("C%d is idle, quitting", conn->fd);
+ break;
+ }
+ }
+ }
+ goto search_again;
+ }
+}
/*========== overall control of article flow ==========*/
break;
Conn *walk, *use=0;
- int spare;
+ int spare, inqueue;
/* Find a connection to offer this article. We prefer a busy
* connection to an idle one, provided it's not full. We take the
* connections, the spare ones will go away eventually.
*/
for (walk=LIST_HEAD(conns); walk; walk=LIST_NEXT(walk)) {
- int inqueue= walk->sent.count + walk->priority.count
- + walk->waiting.count;
+ if (walk->quitting) continue;
+ inqueue= walk->sent.count + walk->priority.count
+ + walk->waiting.count;
spare= walk->max_queue - inqueue;
assert(inqueue <= max_queue_per_conn);
assert(spare >= 0);
else if (spare>0) /*working*/ { use= walk; break; }
}
if (use) {
+ if (!inqueue) use->since_activity= 0; /* reset idle counter */
while (spare>0) {
Article *art= LIST_REMHEAD(queue);
LIST_ADDTAIL(use->waiting, art);
}
}
-static void vconnfail(Conn *conn, const char *fmt, va_list al)
- __attribute__((__format__(printf,2,0)));
-
static void vconnfail(Conn *conn, const char *fmt, va_list al) {
int requeue[art_MaxState];
check_master_queue();
}
-static void connfail(Conn *conn, const char *fmt, ...)
- __attribute__((__format__(printf,2,3)));
static void connfail(Conn *conn, const char *fmt, ...) {
va_list al;
va_start(al,fmt);
if (count > IOV_MAX) count= IOV_MAX;
ssize_t rs= writev(conn->fd, conn->xmit, count);
if (rs < 0) {
- if (errno == EAGAIN) return OOP_CONTINUE;
+ if (isewouldblock(errno)) return OOP_CONTINUE;
connfail(conn, "write failed: %s", strerror(errno));
return OOP_HALT;
}
if (code!=205 && code!=503) {
connfail(conn, "peer gave unexpected response to QUIT: %s", sani);
} else {
- notice("C%d idle connection closed\n");
+ notice("C%d idle connection closed", conn->fd);
assert(!conn->waiting.count);
assert(!conn->priority.count);
assert(!conn->sent.count);
return OOP_CONTINUE;
}
+ conn->since_activity= 0;
Article *art;
#define GET_ARTICLE(musthavesent) \
/*---------- dealing with articles read in the input file ----------*/
static void *feedfile_got_bad_data(InputFile *ipf, off_t offset,
- const char *data, size_t recsz,
- const char *how) {
+ const char *data, const char *how) {
warn("corrupted file: %s, offset %lu: %s: %s",
ipf->path, (unsigned long)offset, how, sanitise(data));
ipf->readcount_err++;
return OOP_CONTINUE;
}
+static void *feedfile_read_err(oop_source *lp, oop_read *rd,
+ oop_rd_event ev, const char *errmsg,
+ int errnoval, const char *data, size_t recsz,
+ void *ipf_v) {
+ InputFile *ipf= ipf_v;
+ assert(ev == OOP_RD_SYSTEM);
+ errno= errnoval;
+ sysdie("error reading input file: %s, offset %lu",
+ ipf->path, (unsigned long)ipf->offset);
+}
+
static void *feedfile_got_article(oop_source *lp, oop_read *rd,
oop_rd_event ev, const char *errmsg,
int errnoval, const char *data, size_t recsz,
off_t old_offset= ipf->offset;
ipf->offset += recsz + 1;
-#define BAD_DATA(m) return feedfile_got_bad_data(ipf,old_offset,data,recsz,m);
+#define X_BAD_DATA(m) return feedfile_got_bad_data(ipf,old_offset,data,m);
+
+ if (ev==OOP_RD_PARTREC)
+ feedfile_got_bad_data(ipf,old_offset,data,"missing final newline");
+ /* but process it anyway */
- if (memchr(data,'\0',recsz)) BAD_DATA("nul byte");
- if (!recsz) BAD_DATA("empty line");
+ if (ipf->skippinglong) {
+ if (ev==OOP_RD_OK) ipf->skippinglong= 0; /* fine now */
+ return;
+ }
+ if (ev==OOP_RD_LONG) {
+ ipf->skippinglong= 1;
+ X_BAD_DATA("overly long line");
+ }
+
+ if (memchr(data,'\0',recsz)) X_BAD_DATA("nul byte");
+ if (!recsz) X_BAD_DATA("empty line");
if (data[0]==' ') {
- if (strspn(data," ") != recsz) BAD_DATA("line partially blanked");
+ if (strspn(data," ") != recsz) X_BAD_DATA("line partially blanked");
ipf->readcount_blank++;
return OOP_CONTINUE;
}
char *space= strchr(data,' ');
int tokenlen= space-data;
int midlen= (int)recsz-tokenlen-1;
- if (midlen <= 0) BAD_DATA("no room for messageid");
+ if (midlen <= 2) X_BAD_DATA("no room for messageid");
+ if (space[1]!='<' || space[midlen]!='>') X_BAD_DATA("invalid messageid");
- if (tokenlen != sizeof(TOKEN)*2+2) BAD_DATA("token wrong length");
+ if (tokenlen != sizeof(TOKEN)*2+2) X_BAD_DATA("token wrong length");
memcpy(tokentextbuf, data, tokenlen);
tokentextbuf[tokenlen]= 0;
- if (!IsToken(tokentextbuf)) BAD_DATA("token wrong syntax");
+ if (!IsToken(tokentextbuf)) X_BAD_DATA("token wrong syntax");
ipf->readcount_ok++;
for (;;) {
int r= read(filemon_inotify_fd, &iev, sizeof(iev));
if (r==-1) {
- if (errno==EAGAIN) break;
+ if (isewouldblock(errno)) break;
sysdie("read from inotify master");
} else if (r==sizeof(iev)) {
assert(iev.wd >= 0 && iev.wd < filemon_inotify_wdmax);
static const oop_rd_style feedfile_rdstyle= {
OOP_RD_DELIM_STRIP, '\n',
OOP_RD_NUL_PERMIT,
- OOP_RD_SHORTREC_EOF,
+ OOP_RD_SHORTREC_LONG,
};
static void inputfile_tailing_start(InputFile *ipf) {
assert(!ipf->fd);
- ipf->readable->on_readable= tailing_on_readable;
+ ipf->readable.on_readable= tailing_on_readable;
ipf->readable.on_cancel= tailing_on_cancel;
ipf->readable.try_read= tailing_try_read;
ipf->readable.delete_tidy= 0; /* we never call oop_rd_delete_{tidy,kill} */
assert(ipf->fd);
int r= oop_rd_read(ipf->rd, &feedfile_rdstyle, MAX_LINE_FEEDFILE,
- feedfile_got_article,ipf, feedfile_problem,ipf);
+ feedfile_got_article,ipf, feedfile_read_err, ipf);
if (r) sysdie("unable start reading feedfile %s",ipf->path);
}
* ->8-
*/
+static void startup_set_input_file(InputFile *f) {
+ assert(!main_input_file);
+ main_input_file= f;
+ inputfile_tailing_start(f);
+}
+
static void statemc_init(void) {
struct stat stab, stabf;
memset(&fl,0,sizeof(fl));
fl.l_type= F_WRLCK;
fl.l_whence= SEEK_SET;
- r= fcntl(lockfd, F_SETLK, &fl);
+ int r= fcntl(lockfd, F_SETLK, &fl);
if (r==-1) {
- if (errno==EACCES || errno==EAGAIN) {
+ if (errno==EACCES || isewouldblock(errno)) {
if (quiet_multiple) exit(0);
fatal("another duct holds the lockfile");
}
sysdie("fcntl F_SETLK lockfile %s", path_lock);
}
- xfstat_isreg(lockfd, &stabf, "lockfile");
+ xfstat_isreg(lockfd, &stabf, path_lock, "lockfile");
int lock_noent;
xlstat_isreg(path_lock, &stab, &lock_noent, "lockfile");
int noent_f;
InputFile *file_d= open_input_file(path_flushing);
- if (file_d) xfstat_isreg(file_d->fd, &stab_d, "flushing file");
+ if (file_d) xfstat_isreg(file_d->fd, &stab_d, path_flushing,"flushing file");
xlstat_isreg(feedfile, &stab_f, &noent_f, "feedfile");
SMS(SEPARATED, 0, "found both old and current feed files");
} else {
debug("startup: F exists, D ENOENT => Normal");
- FILE *file_f= open_input_file(feedfile);
+ InputFile *file_f= open_input_file(feedfile);
if (!file_f) die("feed file vanished during startup");
startup_set_input_file(file_f);
SMS(NORMAL, flushfail_retry_periods, "normal startup");
static void statemc_start_flush(const char *why) { /* Normal => Flushing */
assert(sms == sm_NORMAL);
- debug("starting flush (%s) (%lu >= %lu) (%d)",
+ debug("starting flush (%s) (%lu >?= %lu) (%d)",
why,
- (unsigned long)ipf->offset, (unsigned long)flush_threshold,
+ (unsigned long)(main_input_file ? main_input_file->offset : 0),
+ (unsigned long)target_max_feedfile_size,
sm_period_counter);
- int r= link(feedfile, duct_path);
- if (r) sysdie("link feedfile %s to flushing file %s", feedfile,
- path_duct);
+ int r= link(feedfile, path_flushing);
+ if (r) sysdie("link feedfile %s to flushing file %s",
+ feedfile, path_flushing);
/* => Hardlinked */
xunlink(feedfile, "old feedfile link");
}
}
-static void startup_set_input_file(InputFile *f) {
- assert(!main_input_file);
- main_input_file= f;
- inputfile_tailing_start(f);
-}
-
static int inputfile_is_done(InputFile *ipf) {
if (!ipf) return 0;
if (ipf->inprogress) return 0; /* new article in the meantime */
const char *spec) {
#define RCI_NOTHING(x) /* nothing */
#define RCI_TRIPLE_FMT(x) " " #x "=" RCI_TRIPLE_FMT_BASE
-#define RCI_TRIPLE_VALS(x) , RCI_TRIPLE_VALS_BASE(ipf->counts, .x)
+#define RCI_TRIPLE_VALS(x) , RCI_TRIPLE_VALS_BASE(ipf->counts, [RC_##x])
+
+#define CNT(art,rc) (ipf->counts[art_##art][RC_##rc])
info("processed %s%s read=%d(+%dbl,+%derr)"
" offered=%d(ch%d,nc%d) accepted=%d(ch%d+nc%d)"
,
what, spec,
ipf->readcount_ok, ipf->readcount_blank, ipf->readcount_err,
- ipf->counts[art_Unchecked].sent + ipf->counts[art_Unsolicited].sent
- , ipf->counts[art_Unchecked].sent, ipf->counts[art_Unsolicited].sent,
- ipf->counts[art_Wanted].accepted + ipf->counts[art_Unsolicited].accepted
- ,ipf->counts[art_Wanted].accepted,ipf->counts[art_Unsolicited].accepted
+ CNT(Unchecked,sent) + CNT(Unsolicited,sent)
+ , CNT(Unchecked,sent), CNT(Unsolicited,sent),
+ CNT(Wanted,accepted) + CNT(Unsolicited,accepted)
+ , CNT(Wanted,accepted), CNT(Unsolicited,accepted)
RESULT_COUNTS(RCI_NOTHING, RCI_TRIPLE_VALS)
);
+
+#undef CNT
}
static void statemc_check_backlog_done(void) {
- InputFile *ipf= backlog_input_file();
+ InputFile *ipf= backlog_input_file;
if (!inputfile_is_done(ipf)) return;
- const char *slash= strrchr(ipf->path, "/");
+ const char *slash= strrchr(ipf->path, '/');
const char *leaf= slash ? slash+1 : ipf->path;
- const char *under= strchr(slash, "_");
+ const char *under= strchr(slash, '_');
const char *rest= under ? under+1 : leaf;
if (!strncmp(rest,"backlog",7)) rest += 7;
notice_processed(ipf,"backlog:",rest);
/* truncate away any half-written records */
- xfstat_isreg(fileno(defer), &stab, "newly opened defer file");
+ xfstat_isreg(fileno(defer), &stab, path_defer, "newly opened defer file");
if (stab.st_size > LONG_MAX)
die("defer file %s size is far too large", path_defer);
if (fseek(defer, truncto-1, SEEK_SET) < 0)
sysdie("seek in defer file %s while truncating partial", path_defer);
- r= getc(defer);
+ int r= getc(defer);
if (r==EOF) {
if (ferror(defer))
sysdie("failed read from defer file %s", path_defer);
if (!defer)
return;
- xfstat(fileno(defer), &stab, "defer file");
+ struct stat stab;
+ xfstat_isreg(fileno(defer), &stab, path_defer, "defer file");
if (fclose(defer)) sysfatal("could not close defer file %s", path_defer);
defer= 0;
+ time_t now= xtime();
+
char *backlog= xasprintf("%s_backlog_%lu.%lu", feedfile,
- (unsigned long)now.tv_sec,
+ (unsigned long)now,
(unsigned long)stab.st_ino);
- if (link(path_defer, path_backlog))
+ if (link(path_defer, backlog))
sysfatal("could not install defer file %s as backlog file %s",
path_defer, backlog);
if (unlink(path_defer))
sysdie("could not unlink old defer link %s to backlog file %s",
path_defer, backlog);
+ free(backlog);
+
if (until_backlog_nextscan < 0 ||
until_backlog_nextscan > backlog_retry_minperiods + 1)
until_backlog_nextscan= backlog_retry_minperiods + 1;
/* returns non-0 iff there are any backlog files */
glob_t gl;
- int r;
+ int r, i;
struct stat stab;
const char *oldest_path=0;
time_t oldest_mtime, now;
- if (backlog_input_file) return 3;
+ if (backlog_input_file) return;
try_again:
exit(0);
}
until_backlog_nextscan= backlog_spontaneous_rescan_periods;
- return 0;
+ return;
}
- now= time(); if (now==-1) sysdie("time(2) failed");
+ now= xtime();
double age= difftime(now, oldest_mtime);
long age_deficiency= (backlog_retry_minperiods * PERIOD_SECONDS) - age;
}
inputfile_tailing_start(backlog_input_file);
until_backlog_nextscan= -1;
- return 1;
+ return;
}
until_backlog_nextscan= age_deficiency / PERIOD_SECONDS;
debug("backlog scan: young age=%f deficiency=%ld nextscan=%d oldest=%s",
age, age_deficiency, until_backlog_nextscan, oldest_path);
- return 2;
+ return;
}
/*========== flushing the feed ==========*/
static void *inndcomm_event(oop_source *lp, int fd, oop_event e, void *u) {
assert(inndcomm_child);
int status= xwaitpid(&inndcomm_child, "inndcomm");
- loop->cancel_fd(fd);
+ cancel_fd_read_except(fd);
close(fd);
assert(!flushing_input_file);
if (pipe(pipefds)) sysdie("create pipe for inndcomm child sentinel");
- inndcomm_child= xfork();
+ inndcomm_child= xfork("inndcomm child");
if (!inndcomm_child) {
- static char flushargv[2]= { sitename, 0 };
+ const char *flushargv[2]= { sitename, 0 };
char *reply;
+ int r;
close(pipefds[0]);
postfork_stdio(defer);
}
-#define EVERY(what, interval, body) \
- static const struct timeval what##_timeout = { 5, 0 }; \
+#define EVERY(what, interval_sec, interval_usec, body) \
+ static const struct timeval what##_timeout = \
+ { interval_sec, interval_usec }; \
static void what##_schedule(void); \
static void *what##_timedout(oop_source *lp, struct timeval tv, void *u) { \
{ body } \
loop->on_time(loop, what##_timeout, what##_timedout, 0); \
}
-EVERY(filepoll, {5,0}, {
+EVERY(filepoll, 5,0, {
if (main_input_file && main_input_file->readable_callback)
filemon_callback(main_input_file);
});
-#define DEBUGF_IPF(wh) " " #wh "=%p/%s:ip=%ld,off=%ld,fd=%d%s" \
-#define DEBUG_IPF(sh) \
+#define DEBUGF_IPF(wh) " " #wh "=%p/%s:ip=%ld,off=%ld,fd=%d%s"
+#define DEBUG_IPF(wh) \
wh##_input_file, debug_ipf_path(wh##_input_file), \
wh##_input_file->inprogress, (long)wh##_input_file->offset, \
wh##_input_file->fd, wh##_input_file->rd ? "+" : ""
return slash ? slash+1 : ipf->path;
}
-EVERY(period, {PERIOD_SECONDS,0}, {
+EVERY(period, PERIOD_SECONDS,0, {
debug("PERIOD"
" sms=%s[%d] conns=%d queue=%d until_connect=%d"
- " input_files" DEBUGF_IPF(main) DEBUGF_IPF(old) DEBUGF_FMT(flushing)
+ " input_files" DEBUGF_IPF(main) DEBUGF_IPF(old) DEBUGF_IPF(flushing)
" children connecting=%ld inndcomm_child"
,
sms_names[sms], sm_period_counter,
if (!backlog_input_file) close_defer(); /* want to start on a new backlog */
statemc_period_poll();
check_master_queue();
+ check_idle_conns();
});
/*========== option parsing ==========*/
+/*---------- generic option parser and logging ----------*/
+
+static void vbadusage(const char *fmt, va_list al) NORET_PRINTF(1,0);
+static void vbadusage(const char *fmt, va_list al) {
+ abort();
+}
+static void badusage(const char *fmt, ...) NORET_PRINTF(1,2);
+static void badusage(const char *fmt, ...) {
+ va_list al;
+ va_start(al,fmt);
+ vbadusage(fmt,al);
+}
+
enum OptFlags {
- of_seconds= 001000u;
- of_boolean= 002000u;
+ of_seconds= 001000u,
+ of_boolean= 002000u,
};
typedef struct Option Option;
typedef void OptionParser(const Option*, const char *val);
struct Option {
- int short;
- const char *long;
+ int shrt;
+ const char *lng;
void *store;
OptionParser *fn;
- int noarg;
+ int noarg, intval;
};
-void op_integer(const Option *o, const char *val) {
+/*---------- specific option types ----------*/
+
+static void op_integer(const Option *o, const char *val) {
char *ep;
errno= 0;
unsigned long ul= strtoul(val,&ep,10);
if (*ep || ep==val || errno || ul>INT_MAX)
- badusage("bad integer value for %s",o->long);
+ badusage("bad integer value for %s",o->lng);
int *store= o->store;
*store= ul;
}
-void op_double(const Option *o, const char *val) {
+static void op_double(const Option *o, const char *val) {
int *store= o->store;
char *ep;
errno= 0;
*store= strtod(val, &ep);
if (*ep || ep==val || errno)
- badusage("bad floating point value for %s",o->long);
+ badusage("bad floating point value for %s",o->lng);
}
-void op_string(const Option *o, const char *val) {
- char **store= o->store;
- free(*store);
+static void op_string(const Option *o, const char *val) {
+ const char **store= o->store;
*store= val;
}
-void op_seconds(const Option *o, const char *val) {
+static void op_seconds(const Option *o, const char *val) {
int *store= o->store;
char *ep;
+ int unit;
double v= strtod(val,&ep);
- if (ep==val) badusage("bad time/duration value for %s",o->long);
+ 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;
- else badusage("bad units %s for time/duration value for %s",ep,o->long);
+ else badusage("bad units %s for time/duration value for %s",ep,o->lng);
v *= unit;
v= ceil(v);
- if (v > INT_MAX) badusage("time/duration value for %s out of range",o->long);
+ if (v > INT_MAX) badusage("time/duration value for %s out of range",o->lng);
*store= v;
}
-void op_periods_rndup(const Option *o, const char *val) {
+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;
}
-void op_periods_booltrue(const Option *o, const char *val) {
- int *store= o->store;
- *store= 1;
-}
-void op_periods_boolfalse(const Option *o, const char *val) {
+static void op_setint(const Option *o, const char *val) {
int *store= o->store;
- *store= 0;
+ *store= o->intval;
}
+/*---------- specific options ----------*/
+
static const Option options[]= {
{'f',"feedfile", &feedfile, op_string },
-{'q',"quiet-multiple", &quiet_multiple, op_booltrue, 1 },
+{'q',"quiet-multiple", &quiet_multiple, op_setint, 1,1 },
-{ 0, "max-connections", &max_connections op_integer },
-{ 0, "max-queue-per-conn", &max_queue_per_conn op_integer },
+{ 0, "max-connections", &max_connections, op_integer },
+{ 0, "max-queue-per-conn", &max_queue_per_conn, op_integer },
-{ 0, "streaming", &try_stream, op_booltrue, 1 },
-{ 0, "no-streaming", &try_stream, op_boolfalse, 1 },
-{'P',"port", &port op_integer },
+{ 0, "streaming", &try_stream, op_setint, 1,1 },
+{ 0, "no-streaming", &try_stream, op_setint, 1,0 },
+{'P',"port", &port, op_integer },
{ 0, "inndconf", &inndconffile, op_string },
-{'d',"daemon", &become_daemon, op_booltrue, 1 },
-{ 0, "no-daemon", &become_daemon, op_boolfalse, 1 },
+{'d',"daemon", &become_daemon, op_setint, 1,1 },
+{ 0, "no-daemon", &become_daemon, op_setint, 1,0 },
{ 0, "no-check-proportion", &nocheck_thresh_pct, op_double },
{ 0, "no-check-filter", &nocheck_decay_articles, op_double },
{ 0, "reconnect-interval", &reconnect_delay_periods, op_periods_rndup },
{ 0, "flush-retry-interval", &flushfail_retry_periods, op_periods_rndup },
-{ 0, "connection-timeout", &connection_timeout, op_seconds },
{ 0, "inndcomm-timeout", &inndcomm_flush_timeout, op_seconds },
};
arg++;
char *equals= strchr(arg,'=');
int len= equals ? (equals - arg) : strlen(arg);
- for (o=options; o->long; o++)
- if (strlen(o->long) == len && !memcmp(o->long,arg,len))
+ for (o=options; o->lng; o++)
+ if (strlen(o->lng) == len && !memcmp(o->lng,arg,len))
goto found_long;
badusage("unknown long option --%s",arg);
found_long:
if (o->noarg) {
- if (equals) badusage("option --%s does not take a value",o->long);
+ if (equals) badusage("option --%s does not take a value",o->lng);
arg= 0;
} else if (equals) {
arg= equals+1;
} else {
arg= *++argv;
- if (!arg) badusage("option --%s needs a value",o->long);
+ if (!arg) badusage("option --%s needs a value",o->lng);
}
o->fn(o, arg);
break; /* eaten the whole argument now */
}
- for (o=options; o->long; o++)
- if (a == o->short)
+ for (o=options; o->lng; o++)
+ if (a == o->shrt)
goto found_short;
badusage("unknown short option -%c",a);
found_short:
} else {
if (!*++arg) {
arg= *++argv;
- if (!arg) badusage("option -%c needs a value",o->short);
+ if (!arg) badusage("option -%c needs a value",o->shrt);
}
o->fn(o,arg);
break; /* eaten the whole argument now */
if (strchr(feedfile, c))
badusage("feed filename may not contain metacharacter %c",c);
- loop= oop_sys_new();
- if (!loop) sysdie("could not create liboop event loop");
+ oop_source_sys *sysloop= oop_sys_new();
+ if (!sysloop) sysdie("could not create liboop event loop");
+ loop= (oop_source*)sysloop;
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
sysdie("could not ignore SIGPIPE");
if (become_daemon) {
+ int i;
for (i=3; i<255; i++)
/* do this now before we open syslog, etc. */
close(i);
notice("starting");
- if (!filemon_init()) {
+ if (!filemon_method_init()) {
warn("no file monitoring available, polling");
filepoll_schedule();
}
statemc_init();
- loop->execute.
+ void *r= oop_sys_run(sysloop);
+ assert(r == OOP_ERROR);
+ sysdie("event loop failed");
}