From 92122665e534978a1bdb499e6b8cf48e54b041d3 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 27 Nov 2012 12:09:18 -0500
Subject: made Reporting plugin and transports debuggable, respond to
 set_debug/toggle_debug RMI

---
 src/lib/Bcfg2/Reporting/Transport/DirectStore.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'src/lib/Bcfg2/Reporting/Transport/DirectStore.py')

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:
-- 
cgit v1.2.3-1-g7c22