diff options
| -rw-r--r-- | src/lib/Server/Core.py | 4 | ||||
| -rw-r--r-- | src/lib/Server/Plugin.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py index d08782ff6..f139ef99b 100644 --- a/src/lib/Server/Core.py +++ b/src/lib/Server/Core.py @@ -117,10 +117,10 @@ class Core(Component): while not terminate.isSet(): try: if famfd: - select.select([famfd], [], [], 15) + select.select([famfd], [], [], 2) else: if not self.fam.pending(): - time.sleep(15) + terminate.wait(15) self.fam.handle_event_set(self.lock) except: continue diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py index 732d291b1..3558fcd9e 100644 --- a/src/lib/Server/Plugin.py +++ b/src/lib/Server/Plugin.py @@ -226,7 +226,7 @@ class ThreadedStatistics(Statistics, return while not self.terminate.isSet(): try: - (xdata, client) = self.work_queue.get(block=True, timeout=5) + (xdata, client) = self.work_queue.get(block=True, timeout=2) except Queue.Empty: continue except Exception, e: |