Refactor logging logic.

Also, introduce new option 'logger-prefix' to determine the prefix of
each log line.

Closes: #942725.

1 files changed, 2 insertions, 1 deletions

diff --git a/pullimap b/pullimap
index 81811e9..dcbe59b 100755
--- a/pullimap
+++ b/pullimap
@@ -233,7 +233,8 @@ sub smtp_send(@) {
 my $IMAP = do {
     my %config = (%$CONF, %CONFIG{qw/quiet debug/}, name => $ARGV[0]);
     $config{keepalive} = 1 if defined $CONFIG{idle};
-    $config{'logger-fd'} = \*STDERR if $CONFIG{debug};
+    $config{'logger-prefix'} = "%?n?%?m?%n(%m)&%n?: ?";
+    delete $config{mailbox}; # use SELECTed mailbox in log messages
     Net::IMAP::InterIMAP::->new( %config );
 };