soar_auditing_provider 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b51be1b463900ba2715d257a51f3a0cdfa8c460
-  data.tar.gz: 3ef84c3086184040563844bf10e36c548fb97886
+  metadata.gz: 2e5afebbca1923373653a142f02a6a7c5dda6d2f
+  data.tar.gz: 1367dbae9df9debc6a777158732b2a41b25baffc
 SHA512:
-  metadata.gz: 57cea7784dab0e044ccefb314bef4579b06dddd823a8c7d0883d7628d73db9a1b4ef4f96df3a2d59183ebb6881eaaf5c184912c80ce2a8f3dc72a2e606d3cd90
-  data.tar.gz: bd2fd69d3e94fbb4dfa9e81779afa17e623a7807e6da60ca3b5595e47cbcfabadd80ed24c5db004535b3e7bd8383e96f01c0b29cc04721e5f469b69f6b23f0e4
+  metadata.gz: e8ee231018f389d0754d23327b9c1c20e78422d100a4b3feacce9443368686de6274bae80db18172744d355195f5d0ca2114d66ae33ad7847c4da6e3285325e3
+  data.tar.gz: a4914177481c905ca9438302cbd230f1dbf6f22845b6267c92de887a4464c8f50038d158111b55284a179f9c204f618d21da013ae3564e58896feb9a39a3f4ee

data/lib/soar_auditing_provider/auditing_worker.rb

@@ -13,6 +13,7 @@ module SoarAuditingProvider
     def initialize
       @queue = Queue.new
       @start_mutex = Mutex.new
+      @queue_mutex = Mutex.new
       initialize_metrics
     end
 
@@ -26,20 +27,16 @@ module SoarAuditingProvider
     end
 
     def enqueue(level, data)
-      if @queue.size < @maximum_queue_size then
+      @queue_mutex.synchronize {
+        raise AuditingOverflowError if @queue.size >= @maximum_queue_size
         @queue.push({:level => level, :data => data})
-      else
-        raise AuditingOverflowError
-      end
-      ensure_worker_is_running
+        start
+      }
     end
 
-    def start(verbose: false)
+    def start
       @start_mutex.synchronize {
-        if not running? then
-          super()
-          $stderr.puts("Auditing worker was not running and respawned") if verbose
-        end
+        super if not running?
       }
     end
 
@@ -64,11 +61,16 @@ module SoarAuditingProvider
         failed_before = true
         retry
       end
-      return false #indicates to thread worder that we are not done executing
+
+      @queue_mutex.synchronize {
+        return false if not @queue.empty? #indicates to thread worker that we are not done executing since the queue is not empty
+        stop #explicitly stop the thread so that the stop occur automatically along with queue operations.
+        return true #indicates to thread worker that we are done executing since the queue is empty
+      }
     end
 
     def flush(timeout = 1)
-      ensure_worker_is_running
+      start
       wait_for_worker_to_clear_queue(timeout)
       fallback_flush_to_stderr if @queue.size > 0
     end
@@ -101,10 +103,6 @@ module SoarAuditingProvider
       $stderr.puts "#{notification}: #{message}"
     end
 
-    def ensure_worker_is_running
-      start(verbose: true)
-    end
-
     def ensure_worker_is_stopped
       attempt_graceful_stop
       sleep_while_still_running(5)

data/lib/soar_auditing_provider/version.rb

@@ -1,3 +1,3 @@
 module SoarAuditingProvider
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soar_auditing_provider
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Ernst van Graan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler