case sm_SEPARATED:
case sm_DROPPING:
- warn("abandoning old feedfile after flush (%s), autodeferring",
- why ? why : "took too long to complete");
+ if (conns.count)
+ warn("abandoning old feedfile after flush (%s), autodeferring",
+ why ? why : "took too long to complete");
+ else
+ info("autodeferring after flush (%s)",
+ why ? why : "no connections");
assert(flushing_input_file);
autodefer_input_file(flushing_input_file);
return 1;
#define CNT(art,rc) (counts->results[art_##art][RC_##rc])
char *inprog= ipf_xtra && !completed
- ? xasprintf(" inprogress=%ld", ipf_xtra->inprogress)
- : xasprintf("%s",""); /* GCC produces a stupid warning for printf("") ! */
+ ? masprintf(" inprogress=%ld", ipf_xtra->inprogress)
+ : masprintf("%s",""); /* GCC produces a stupid warning for printf("") ! */
char *autodefer= ipf_xtra && ipf_xtra->autodefer >= 0
- ? xasprintf(" autodeferred=%ld", ipf_xtra->autodefer)
- : xasprintf("%s","");
+ ? masprintf(" autodeferred=%ld", ipf_xtra->autodefer)
+ : masprintf("%s","");
- info("%s %s read=%d (+bl=%d,+err=%d)%s%s"
+ notice("%s %s read=%d (+bl=%d,+err=%d)%s%s"
" missing=%d offered=%d (ch=%d,nc=%d) accepted=%d (ch=%d,nc=%d)"
RESULT_COUNTS(RCI_NOTHING, RCI_TRIPLE_FMT)
,
InputFile *ipf= backlog_input_file;
if (!inputfile_is_done(ipf)) return;
+ dbg("backlog file %p %s complete", ipf, ipf->path);
backlog_accumulate_counts(ipf);
close_input_file(ipf);
if (unlink(ipf->path)) {
assert(sms==sm_SEPARATED || sms==sm_DROPPING);
- notice_processed_inputfile(ipf,1,"feedfile");
+ notice_processed_inputfile(ipf,1,"batch");
close_defer();
}
void showstats(void) {
+ notice_conns_stats();
notice_processed_inputfile(main_input_file, 0, "feedfile");
notice_processed_inputfile(flushing_input_file, 0, "flushing");
}
static void sigarrived_handler(int signum) {
+ int esave = errno;
static char x;
switch (signum) {
case SIGTERM:
default:
abort();
}
- write(signal_self_pipe[1],&x,1);
+ int r = write(signal_self_pipe[1],&x,1);
+ if (!(r==1 || isewouldblock(errno))) abort();
+ errno = esave;
}
void init_signals(void) {