diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-11-27 12:09:18 -0500 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-11-27 12:12:35 -0500 |
commit | 92122665e534978a1bdb499e6b8cf48e54b041d3 (patch) | |
tree | e4271e96d051c7ddabe96ba9c43d589dffd4bb35 /src/lib/Bcfg2/Reporting/Transport/DirectStore.py | |
parent | c19e7da20ca6b67956338f9808a80673e06b1e94 (diff) | |
download | bcfg2-92122665e534978a1bdb499e6b8cf48e54b041d3.tar.gz bcfg2-92122665e534978a1bdb499e6b8cf48e54b041d3.tar.bz2 bcfg2-92122665e534978a1bdb499e6b8cf48e54b041d3.zip |
made Reporting plugin and transports debuggable, respond to set_debug/toggle_debug RMI
Diffstat (limited to 'src/lib/Bcfg2/Reporting/Transport/DirectStore.py')
-rw-r--r-- | src/lib/Bcfg2/Reporting/Transport/DirectStore.py | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Reporting/Transport/DirectStore.py b/src/lib/Bcfg2/Reporting/Transport/DirectStore.py index d1ad7c2f2..79d1b5aba 100644 --- a/src/lib/Bcfg2/Reporting/Transport/DirectStore.py +++ b/src/lib/Bcfg2/Reporting/Transport/DirectStore.py @@ -21,6 +21,8 @@ class DirectStore(TransportBase, threading.Thread): self.queue = Queue(100000) self.terminate = threading.Event() + self.debug_log("Reporting: Starting %s thread" % + self.__class__.__name__) self.start() def shutdown(self): @@ -38,6 +40,8 @@ class DirectStore(TransportBase, threading.Thread): def run(self): if not self._load(): + self.logger.warning("Reporting: Failed to load saved data, " + "DirectStore thread exiting") return while not self.terminate.isSet() and self.queue is not None: try: @@ -45,16 +49,19 @@ class DirectStore(TransportBase, threading.Thread): timeout=self.timeout) start = time.time() self.storage.import_interaction(interaction) - self.logger.info("Imported data for %s in %s seconds" \ - % (interaction.get('hostname', '<unknown>'), \ - time.time() - start)) + self.logger.info("Imported data for %s in %s seconds" % + (interaction.get('hostname', '<unknown>'), + time.time() - start)) except Empty: + self.debug_log("Reporting: Queue is empty") continue except: err = sys.exc_info()[1] self.logger.error("Reporting: Could not import interaction: %s" % err) continue + self.debug_log("Reporting: Stopping %s thread" % + self.__class__.__name__) if self.queue is not None and not self.queue.empty(): self._save() @@ -77,6 +84,8 @@ class DirectStore(TransportBase, threading.Thread): def _save(self): """ Save any saved data to a file """ + self.debug_log("Reporting: Saving pending data to %s" % + self.save_file) saved_data = [] try: while not self.queue.empty(): @@ -96,6 +105,7 @@ class DirectStore(TransportBase, threading.Thread): def _load(self): """ Load any saved data from a file """ if not os.path.exists(self.save_file): + self.debug_log("Reporting: No saved data to load") return True saved_data = [] try: @@ -109,6 +119,8 @@ class DirectStore(TransportBase, threading.Thread): for interaction in saved_data: # check that shutdown wasnt called early if self.terminate.isSet(): + self.logger.warning("Reporting: Shutdown called while loading " + " saved data") return False try: |