X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=backends%2Finnduct.c;h=3c746c3ef09cd8632f1a6162e5d474124893e48b;hb=acb7e5af27dec07c3f53d6b40c253eed1fb2dc04;hp=5caddb5dba0dd69e4fe2366fe1d3c7da7f427d7a;hpb=6bfa7574f2bb27dbe51965c3a73561fdd1dcab28;p=inn-innduct.git diff --git a/backends/innduct.c b/backends/innduct.c index 5caddb5..3c746c3 100644 --- a/backends/innduct.c +++ b/backends/innduct.c @@ -543,7 +543,7 @@ static int nocheck, nocheck_reported, in_child; /* for logging, simulation, debugging, etc. */ int simulate_flush= -1; int logv_use_syslog; -static char *logv_prefix=""; +static const char *logv_prefix=""; /*========== logging ==========*/ @@ -2179,12 +2179,15 @@ static void *feedfile_got_article(oop_source *lp, oop_read *rd, art->offset= old_offset; art->blanklen= recsz; strcpy(art->messageid, space+1); - LIST_ADDTAIL(ipf->queue, art); - if (ipf->autodefer >= 0) + if (ipf->autodefer >= 0) { article_autodefer(ipf, art); - else if (ipf==backlog_input_file) - article_check_expired(art); + } else { + LIST_ADDTAIL(ipf->queue, art); + + if (ipf==backlog_input_file) + article_check_expired(art); + } if (sms==sm_NORMAL && ipf==main_input_file && ipf->offset >= target_max_feedfile_size) @@ -3830,7 +3833,7 @@ int main(int argc, char **argv) { close(i); } - logv_prefix= xasprintf("<%s> ", sitename); + logv_prefix= xasprintf("%s| ", sitename); if (interactive < 2) { openlog("innduct",LOG_NDELAY|LOG_PID,LOG_NEWS); logv_use_syslog= 1;