diff options
| -rw-r--r-- | NEWS | 11 | ||||
| -rw-r--r-- | fetchmail.c | 9 |
2 files changed, 12 insertions, 8 deletions
@@ -97,14 +97,17 @@ fetchmail 6.3.10 (not yet released): errors. Partially taken from Petr Cerny's patch in Novell Bugzilla #246829. The 501 part of said patch was not added, as the maintainer is not convinced 501 is a temporary condition, and softbounce takes care of this anyways. -* Proper precedence ordering for the syslog and logfile options. If the logfile - option is effective (i. e. we're not in daemon mode and nodetach isn't used), - kill the syslog option. If logfile is ineffective (we're not in daemon mode, - or nodetach is set), syslog takes precedence. # CHANGES * Make the comparison of the SSL fingerprints case insensitive, to ease its use. Suggested by Daniel Richard G. +* Proper precedence ordering for the syslog and logfile options. If the logfile + option is effective (i. e. we're not in daemon mode and nodetach isn't used), + reset the syslog option. If logfile is ineffective (we're not in daemon mode, + or nodetach is set), syslog takes precedence. +* The sleeping at/awakened at messages appear in logfiles and syslog only if + verbose mode is enabled. On the console, they will still appear without + verbose mode. Fixes Debian Bug#282259. # CHANGES TO CONTRIB * Fix bashism in contrib/fetchsetup. Fixes Debian Bug#530081. diff --git a/fetchmail.c b/fetchmail.c index ad02b700..37abf44b 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -836,7 +836,8 @@ int main(int argc, char **argv) exit(PS_AUTHFAIL); } - if (outlevel > O_SILENT) + if ((outlevel > O_SILENT && !run.use_syslog && isatty(1)) + || outlevel > O_NORMAL) report(stdout, GT_("sleeping at %s for %d seconds\n"), timestamp(), run.poll_interval); @@ -871,11 +872,11 @@ int main(int argc, char **argv) ctl->wedged = FALSE; } - if (outlevel > O_SILENT) + if ((outlevel > O_SILENT && !run.use_syslog && isatty(1)) + || outlevel > O_NORMAL) report(stdout, GT_("awakened at %s\n"), timestamp()); } - } while - (run.poll_interval); + } while (run.poll_interval); if (outlevel >= O_VERBOSE) report(stdout, GT_("normal termination, status %d\n"), |