From adedee15f1fe460398a7045b292604df2161adc0 Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Thu, 16 Feb 2023 18:36:41 +0200
Subject: [PATCH] Fix signal timeout handling when accept_sigusr is disabled

A different implementation of the fix proposed in #53.
Thanks @phlip9!
---
 src/signal.rs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/signal.rs b/src/signal.rs
index 6b32aae19..9bc30d9e3 100644
--- a/src/signal.rs
+++ b/src/signal.rs
@@ -1,7 +1,7 @@
 use crossbeam_channel as channel;
 use crossbeam_channel::RecvTimeoutError;
 use std::thread;
-use std::time::Duration;
+use std::time::{Duration, Instant};
 
 use signal_hook::consts::{SIGINT, SIGTERM, SIGUSR1};
 
@@ -34,14 +34,21 @@ impl Waiter {
             ]),
         }
     }
+
     pub fn wait(&self, duration: Duration, accept_sigusr: bool) -> Result<()> {
-        match self.receiver.recv_timeout(duration) {
+        // Determine the deadline time based on the duration, so that it doesn't
+        // get pushed back when wait_deadline() recurses
+        self.wait_deadline(Instant::now() + duration, accept_sigusr)
+    }
+
+    fn wait_deadline(&self, deadline: Instant, accept_sigusr: bool) -> Result<()> {
+        match self.receiver.recv_deadline(deadline) {
             Ok(sig) if sig == SIGUSR1 => {
                 trace!("notified via SIGUSR1");
                 if accept_sigusr {
                     Ok(())
                 } else {
-                    self.wait(duration, accept_sigusr)
+                    self.wait_deadline(deadline, accept_sigusr)
                 }
             }
             Ok(sig) => bail!(ErrorKind::Interrupt(sig)),