From 1cf7053cbc3e3fbacb9770f3532d69192102a842 Mon Sep 17 00:00:00 2001 From: Sunil Shetye Date: Wed, 4 May 2011 23:21:11 +0530 Subject: Do not print "skipping message" for old messages even in verbose mode. --- NEWS | 3 +++ driver.c | 28 ++++++++++------------------ 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/NEWS b/NEWS index 86657c13..f6060ab1 100644 --- a/NEWS +++ b/NEWS @@ -74,6 +74,9 @@ fetchmail-6.3.20 (not yet released): messages and most of the range searches result in nothing. Instead, split the long response to make the IMAP driver think that there are multiple lines of response. (Sunil Shetye) +* Do not print "skipping message" for old messages even in verbose mode. If + there are too many old messages, the logs just get filled without any real + activity. (Sunil Shetye) (suggested by Yunfan Jiang) # TRANSLATION UPDATES [ja] Japanese (Takeshi Hamasaki) diff --git a/driver.c b/driver.c index 5c073d65..cfc4af0f 100644 --- a/driver.c +++ b/driver.c @@ -511,14 +511,11 @@ static int fetch_messages(int mailserver_socket, struct query *ctl, } if (msgcode == MSGLEN_OLD) { - /* To avoid flooding the syslog when using --keep, - * report "Skipped message" only when: - * 1) --verbose is on, or - * 2) fetchmail does not use syslog - */ - if ( (outlevel >= O_VERBOSE) || - (outlevel > O_SILENT && !run.use_syslog) - ) + /* + * To avoid flooding the logs when using --keep, report + * skipping for old messages only when --flush is on. + */ + if (outlevel > O_SILENT && ctl->flush) { report_build(stdout, GT_("skipping message %s@%s:%d"), @@ -810,16 +807,11 @@ flagthemail: } else { - if ( (outlevel >= O_VERBOSE) || - /* To avoid flooding the syslog when using --keep, - * report "Skipped message" only when: - * 1) --verbose is on, or - * 2) fetchmail does not use syslog, or - * 3) the message was skipped for some other - * reason than just being old. - */ - (outlevel > O_SILENT && (!run.use_syslog || msgcode != MSGLEN_OLD)) - ) + /* + * To avoid flooding the logs when using --keep, report + * skipping of new messages only. + */ + if (outlevel > O_SILENT && msgcode != MSGLEN_OLD) report_complete(stdout, GT_(" not flushed\n")); /* maybe we mark this message as seen now? */ -- cgit v1.2.3