Replace those complicated wait construct by a efficient Timer class.

[collecty.git] / collecty / __init__.py

diff --git a/collecty/__init__.py b/collecty/__init__.py
index 5e684f46069a8101f8cf5e9293122f66a8cb2bb5..b7e1f22a802f249129048575f11c6e4c43d33304 100644 (file)
--- a/collecty/__init__.py
+++ b/collecty/__init__.py
@@ -47,14 +47,13 @@ class Collecty(object):
        # The default interval, when all data is written to disk.
        SUBMIT_INTERVAL = 300
 
-       HEARTBEAT = 2
-
        def __init__(self):
                self.config = configparser.ConfigParser()
                self.instances = []
 
                # Indicates whether this process should be running or not.
                self.running = True
+               self.timer = plugins.Timer(self.SUBMIT_INTERVAL, heartbeat=2)
 
                # Add all automatic plugins.
                self.add_autocreate_plugins()
@@ -110,14 +109,11 @@ class Collecty(object):
                        i.start()
 
                # Regularly submit all data to disk.
-               counter = self.SUBMIT_INTERVAL / self.HEARTBEAT
                while self.running:
-                       time.sleep(self.HEARTBEAT)
-                       counter -= 1
+                       self.timer.reset()
 
-                       if counter == 0:
+                       if self.timer.wait():
                                self.submit_all()
-                               counter = self.SUBMIT_INTERVAL / self.HEARTBEAT
 
                # Wait until all instances are finished.
                while self.instances:
@@ -142,6 +138,8 @@ class Collecty(object):
                log.debug(_("Received shutdown signal"))
 
                self.running = False
+               if self.timer:
+                       self.timer.cancel()
 
                # Propagating shutdown to all threads.
                for i in self.instances: