net_reader: combine Net::NNTP and IMAPClient args

[public-inbox.git] / lib / PublicInbox / Watch.pm

diff --git a/lib/PublicInbox/Watch.pm b/lib/PublicInbox/Watch.pm
index 482d35c44687c583a6e3726b9bea4a1dc7f978ef..43ee07143d664a28bffd7513a30d96b3d403e908 100644 (file)
--- a/lib/PublicInbox/Watch.pm
+++ b/lib/PublicInbox/Watch.pm
@@ -353,12 +353,12 @@ sub imap_idle_once ($$$$) {
 sub watch_imap_idle_1 ($$$) {
        my ($self, $uri, $intvl) = @_;
        my $sec = uri_section($uri);
-       my $mic_arg = $self->{mic_arg}->{$sec} or
+       my $mic_arg = $self->{net_arg}->{$sec} or
                        die "BUG: no Mail::IMAPClient->new arg for $sec";
        my $mic;
        local $0 = $uri->mailbox." $sec";
        until ($self->{quit}) {
-               $mic //= PublicInbox::IMAPClient->new(%$mic_arg);
+               $mic //= PublicInbox::IMAPClient->new(%$mic_arg,Keepalive => 1);
                my $err;
                if ($mic && $mic->IsConnected) {
                        local $self->{mics_cached}->{$sec} = $mic;
@@ -530,9 +530,9 @@ sub watch_imap_init ($$) {
        for my $uri (@{$self->{imap_order}}) {
                my $sec = uri_section($uri);
                my $mic = $mics->{$sec};
-               my $intvl = $self->{imap_opt}->{$sec}->{pollInterval};
+               my $intvl = $self->{cfg_opt}->{$sec}->{pollInterval};
                if ($mic->has_capability('IDLE') && !$intvl) {
-                       $intvl = $self->{imap_opt}->{$sec}->{idleInterval};
+                       $intvl = $self->{cfg_opt}->{$sec}->{idleInterval};
                        push @$idle, [ $uri, $intvl // () ];
                } else {
                        push @{$poll->{$intvl || 120}}, $uri;
@@ -549,7 +549,7 @@ sub watch_nntp_init ($$) {
        PublicInbox::NetReader::nntp_common_init($self);
        for my $uri (@{$self->{nntp_order}}) {
                my $sec = uri_section($uri);
-               my $intvl = $self->{nntp_opt}->{$sec}->{pollInterval};
+               my $intvl = $self->{cfg_opt}->{$sec}->{pollInterval};
                push @{$poll->{$intvl || 120}}, $uri;
        }
 }