summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorAlon Levy <alon@pobox.com>2015-04-12 19:30:44 +0200
committerAlon Levy <alon@pobox.com>2015-04-12 19:30:44 +0200
commite05c752927ef58edf67311a6271189fb8a609ba1 (patch)
tree01d6b12f0c7faf72b889841e9e837f43949d71be /src/server
parent310295684fa1e146af9a0e9b3affc5bfdac75f3b (diff)
Revert "server/rz_kernel: switch to 0.5 second polling.."
This reverts commit 3e2452ad6480e726fee8fdf2e3817ef09b0ba34d.
Diffstat (limited to 'src/server')
-rw-r--r--src/server/rz_kernel.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/server/rz_kernel.py b/src/server/rz_kernel.py
index 6069e688..628fdd02 100644
--- a/src/server/rz_kernel.py
+++ b/src/server/rz_kernel.py
@@ -100,17 +100,15 @@ class RZ_Kernel(object):
Handle periodic server tasks:
- manage rzdoc subscriber lists
"""
- while True:
+ while False == self.should_stop:
+
for rzdoc, r_assoc_set in self.rzdoc_reader_assoc_map.items():
for r_assoc in r_assoc_set:
if r_assoc.err_count__IO > 3:
r_assoc_set.remove(r_assoc)
log.info('rz_kernel: evicting reader: IO error count exceeded limit: remote-addr: %s, rzdoc: %s' % (r_assoc.remote_socket_addr,
rzdoc.name))
- for i in xrange(self.heartbeat_period_sec * 2):
- if False == self.should_stop:
- return;
- time.sleep(0.5)
+ time.sleep(self.heartbeat_period_sec)
self.executor = ThreadPoolExecutor(max_workers=8)
self.executor.submit(kernel_heartbeat)