Merge pull request #10 from greggzj/master

propose another way for DelayWorker close issue
niccokunzmann · Jun 16, 2019 · a05f114 · a05f114
2 parents 58e9b01 + 32ba283
commit a05f114
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/server/dhcp.py b/server/dhcp.py
@@ -123,15 +123,17 @@ def _delay_response_thread(self):
         while not self.closed:
             if self.closed:
                 break
-            if not self.queue.empty():
-                p = self.queue.get()
+            try:
+                p = self.queue.get(timeout=1)
                 t, func, args, kw = p
                 now = time.time()
                 if now < t:
                     time.sleep(0.01)
                     self.queue.put(p)
                 else:
                     func(*args, **kw)
+            except queue.Empty: 
+                continue
 
     def do_after(self, seconds, func, args = (), kw = {}):
         self.queue.put((time.time() + seconds, func, args, kw))