diff options
| author | Tim Laszlo <tim.laszlo@gmail.com> | 2012-06-14 11:07:22 -0500 |
|---|---|---|
| committer | Tim Laszlo <tim.laszlo@gmail.com> | 2012-06-14 11:08:42 -0500 |
| commit | c3f70edc456bb47c2058a424f99e4673b8586214 (patch) | |
| tree | d257665c763384f51a120d5068f566fee3b969f1 | |
| parent | 7480e8f11d991b75fe5ece33323734451defc7bd (diff) | |
| download | bcfg2-c3f70edc456bb47c2058a424f99e4673b8586214.tar.gz bcfg2-c3f70edc456bb47c2058a424f99e4673b8586214.tar.bz2 bcfg2-c3f70edc456bb47c2058a424f99e4673b8586214.zip | |
DBStats: watch for missing work queue
(cherry picked from commit d0555789f2af89817b4bf50a4d88e98ad6c20730)
| -rw-r--r-- | src/lib/Server/Plugin.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py index 3e3616f46..28299d8c7 100644 --- a/src/lib/Server/Plugin.py +++ b/src/lib/Server/Plugin.py @@ -289,7 +289,7 @@ class ThreadedStatistics(Statistics, def run(self): if not self.load(): return - while not self.terminate.isSet(): + while not self.terminate.isSet() and self.work_queue != None: try: (xdata, client) = self.work_queue.get(block=True, timeout=2) except Empty: @@ -299,7 +299,7 @@ class ThreadedStatistics(Statistics, self.logger.error("ThreadedStatistics: %s" % e) continue self.handle_statistic(xdata, client) - if not self.work_queue.empty(): + if self.work_queue != None and not self.work_queue.empty(): self.save() def process_statistics(self, metadata, data): |