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])
- assert(!completed || ipf_xtra);
-
- char *inprog= completed
- ? xasprintf("%s","") /* GCC produces a stupid warning for printf("") ! */
- : xasprintf(" inprogress=%ld", ipf_xtra->inprogress);
+ char *inprog= ipf_xtra && !completed
+ ? xasprintf(" inprogress=%ld", ipf_xtra->inprogress)
+ : xasprintf("%s",""); /* GCC produces a stupid warning for printf("") ! */
char *autodefer= ipf_xtra && ipf_xtra->autodefer >= 0
? xasprintf(" autodeferred=%ld", ipf_xtra->autodefer)
: xasprintf("%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)
,
RESULT_COUNTS(RCI_NOTHING, RCI_TRIPLE_VALS)
);
- memset(&counts, 0, sizeof(*counts));
+ memset(counts, 0, sizeof(*counts));
free(inprog);
free(autodefer);
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");