safer interruptability of fake-idle -- reusing the same skip_next_idle pattern as with idle

src/imap.rs

@@ -886,7 +886,12 @@ impl Imap {
             let interval = async_std::stream::interval(Duration::from_secs(60));
             let mut interrupt_interval = interrupt.stop_token().stop_stream(interval);
             *self.interrupt.lock().await = Some(interrupt);
-
+            if self.skip_next_idle_wait.load(Ordering::SeqCst) {
+                // interrupt_idle has happened before we
+                // provided self.interrupt
+                self.skip_next_idle_wait.store(false, Ordering::SeqCst);
+                info!(context, "fake-idle wait was skipped");
+            } else {
                 // loop until we are interrupted or if we fetched something
                 while let Some(_) = interrupt_interval.next().await {
                     // try to connect with proper login params
@@ -921,6 +926,7 @@ impl Imap {
                         }
                     }
                 }
+            }
             self.interrupt.lock().await.take();
 
             info!(

src/job.rs

@@ -1011,4 +1011,5 @@ pub fn interrupt_smtp_idle(context: &Context) {
     state.perform_jobs_needed = 1;
     state.idle = true;
     cvar.notify_one();
+    info!(context, "Interrupting SMTP-idle... ended",);
 }

src/job_thread.rs

@@ -70,6 +70,7 @@ impl JobThread {
 
         state.idle = true;
         cvar.notify_one();
+        info!(context, "Interrupting {}-IDLE... finished", self.name);
     }
 
     pub fn fetch(&mut self, context: &Context, use_network: bool) {