Merge pull request #248 from ramielrowe/master

Adding reconciled send_status back

reports/usage_audit.py

@@ -33,6 +33,9 @@ def _audit_for_exists(exists_query):
     (success, unsent, redirect,
      client_error, server_error) = _send_status_queries(verified)
 
+    (success_rec, unsent_rec, redirect_rec,
+     client_error_rec, server_error_rec) = _send_status_queries(reconciled)
+
     report = {
         'count': exists_query.count(),
         'verified': verified.count(),
@@ -46,6 +49,13 @@ def _audit_for_exists(exists_query):
             'redirect': redirect.count(),
             'client_error': client_error.count(),
             'server_error': server_error.count(),
+        },
+        'send_status_rec': {
+            'success': success_rec.count(),
+            'unsent': unsent_rec.count(),
+            'redirect': redirect_rec.count(),
+            'client_error': client_error_rec.count(),
+            'server_error': server_error_rec.count(),
         }
     }
 

stacktach/stacklog.py

@@ -180,7 +180,8 @@ class LogListener:
     def end(self):
         self.queue.put_nowait(None)
         self.thread.join()
-        self.logger.handler.close()
+        for handler in self.logger.handlers:
+            handler.close()
 
 
 def get_queue(logger_name):

verifier/start_verifier.py

@@ -86,7 +86,8 @@ if __name__ == '__main__':
         verifier.run()
 
     verifier_config.load()
-    log_listener = stacklog.LogListener(_get_parent_logger()).start()
+    log_listener = stacklog.LogListener(_get_parent_logger())
+    log_listener.start()
     for exchange in verifier_config.topics().keys():
         process = Process(target=make_and_start_verifier, args=(exchange,))
         process.start()

worker/start_workers.py

@@ -36,7 +36,8 @@ def kill_time(signal, frame):
 
 
 if __name__ == '__main__':
-    log_listener = stacklog.LogListener(_get_parent_logger()).start()
+    log_listener = stacklog.LogListener(_get_parent_logger())
+    log_listener.start()
     for deployment in config.deployments():
         if deployment.get('enabled', True):
             db_deployment, new = db.get_or_create_deployment(deployment['name'])