LIST_REMOVE(conns,conn);
char *m= xvasprintf(fmt,al);
- warn("C%d (now %d) connection failed requeueing " RCI_TRIPLE_FMT_BASE ": %s",
+ warn("C%d (now %d) connection failed "
+ "(requeueing " RCI_TRIPLE_FMT_BASE "): %s",
conn->fd, conns.count, RCI_TRIPLE_VALS_BASE(requeue, /*nothing*/), m);
free(m);
conn_idle_close(conn, "low volume");
}
+/*---------- reporting numbers of connections ----------*/
+
+static int conns_max_reported, conns_idle_reported;
+
+void notice_conns_more(const char *new_kind) {
+ if (conns.count > conns_max_reported) {
+ notice("up to %d connections (%s)", conns.count, new_kind);
+ conns_max_reported= conns.count;
+ }
+}
+
+void notice_conns_fewer(void) {
+ if (!conns.count && !conns_idle_reported) {
+ notice("low volume, using intermittent connection");
+ conns_idle_reported= 1;
+ }
+}
+
+void notice_conns_stats(void) {
+ notice("currently %d connection(s)", conns.count);
+ conns_max_reported= conns.count;
+ conns_idle_reported= 0;
+}
+
/*---------- making new connections ----------*/
pid_t connecting_child;
if (r) syscrash("oop_rd_read for peer (fd=%d)",conn->fd);
LIST_ADDHEAD(conns, conn);
- notice("C%d (now %d) connected %s",
- conn->fd, conns.count, conn->stream ? "streaming" : "plain");
+ const char *streamdesc= conn->stream ? "streaming" : "plain";
+ info("C%d (now %d) connected %s", conn->fd, conns.count, streamdesc);
+ notice_conns_more(streamdesc);
connect_attempt_discard();
check_assign_articles();
\w+[ ]
innduct\[\d+\]:[ ]
([^|<>: \t]+)\|[ ]
- info:[ ]
+ (?: info | notice ):[ ]
(?: completed | processed )[ ]
.*?
( (?: [ ]
void vconnfail(Conn *conn, const char *fmt, va_list al) PRINTF(2,0);
void connfail(Conn *conn, const char *fmt, ...) PRINTF(2,3);
+void notice_conns_more(const char *new_kind);
+void notice_conns_fewer(void);
+void notice_conns_stats(void);
+
int allow_connect_start(void);
void connect_start(void);
conn->quitting, sani);
} else {
LIST_REMOVE(conns,conn);
- notice("C%d (now %d) idle connection closed (%s)",
+ info("C%d (now %d) idle connection closed (%s)",
conn->fd, conns.count, conn->quitting);
+ notice_conns_fewer();
assert(!busy);
conn_dispose(conn);
}
PEERBADMSG("peer timed us out or stopped accepting articles");
LIST_REMOVE(conns,conn);
- notice("C%d (now %d) idle connection closed by peer",
- conns.count, conn->fd);
+ info("C%d (now %d) idle connection closed by peer",
+ conns.count, conn->fd);
+ notice_conns_fewer();
conn_dispose(conn);
return OOP_CONTINUE;
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;
? 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)
,
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");