soar_auditing_provider 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f6e6230240453cbcf257ea412f057a05cbd6fbf
-  data.tar.gz: 7a1b94a471a5dddc85c830c581f41e36d92983e7
+  metadata.gz: 263b7fc728885f0bc350e4c339cb70c365ab0181
+  data.tar.gz: 2ef1bee6ad5a0b42568ceb41bdb6a621c3b9df77
 SHA512:
-  metadata.gz: 2431fa22341e866135f6e431fe151a9566e44fa51f83275d1ced4ffd6161bf4c55306ad58c9333102d405d46cb51f3d1e191f9884d11bae88eba230f24f07ad7
-  data.tar.gz: a0de67d9d644f525e28cfd30700d158f29c864c123a410dd44b38bc98b1c6260ebad9b2ca1ab04809af41e649a376ce7ad1615f5c38a3a95b2da3f21949ec3ea
+  metadata.gz: 0bd74895116aaa81c4dc780f42a54a5a569a16d8a3040eb26affabffa64dc43d13cd9ad97ec48a34af55a91a8a4eadb2424806f5df5c79a4fb3b076cb9374ae4
+  data.tar.gz: 53d08d6854c16b74168a711d9f85a0a7774737d6149c2f2916d2ef2c59fa56e8e40cc8fbaba6f71810140c8e41498fec41fec24287deba3c4cd7fe757bebce2d

data/lib/soar_auditing_provider/auditing_provider.rb

@@ -78,6 +78,13 @@ module SoarAuditingProvider
       @worker.flush
     end
 
+    def audit_exception(exception:, level: :error, flow_id: nil)
+      exception_message = "#{exception.class}: #{exception.message}"
+      exception_message = exception_message + ":\n\t" + exception.backtrace.join("\n\t") if ENV['RACK_ENV'] == 'development'
+      level = :error if not is_valid_audit_level?(level)
+      send(level,exception_message,flow_id)
+    end
+
     private
 
     def prepend_caller_information(data)
@@ -97,17 +104,11 @@ module SoarAuditingProvider
     end
 
     def exit_cleanup(exception = nil)
-      audit_exception_message(exception) if exception
+      audit_exception(exception: exception, level: :fatal, flow_id: @startup_flow_id) if exception
       info("Application exit",@startup_flow_id)
       flush
     end
 
-    def audit_exception_message(exception)
-      exception_message = "#{exception.class}: #{exception.message}"
-      exception_message = exception_message + ":\n\t" + exception.backtrace.join("\n\t") if ENV['RACK_ENV'] == 'development'
-      fatal(exception_message,@startup_flow_id)
-    end
-
     def enqueue(level, data)
       @worker.enqueue(level, data)
       @enqueued_audit_events += 1
@@ -178,5 +179,9 @@ module SoarAuditingProvider
         'startup_timestamp'      => @startup_timestamp
       }
     end
+
+    def is_valid_audit_level?(level)
+      [:debug, :info, :warn, :error, :fatal].include?(level)
+    end
   end
 end

data/lib/soar_auditing_provider/auditing_worker.rb

@@ -2,10 +2,17 @@ require 'soar_thread_worker/thread_worker'
 
 module SoarAuditingProvider
   class AuditingWorker < SoarThreadWorker::ThreadWorker
+    attr_reader :failed_audit_attempts
+    attr_reader :latest_failed_audit_timestamp
+    attr_reader :latest_failed_audit_error_message
+    attr_reader :successful_audits
+    attr_reader :dequeued_audits
+    attr_reader :latest_successful_audit_timespan
+    attr_reader :latest_successful_audit_timestamp
+
     def initialize
       @queue = Queue.new
       @start_mutex = Mutex.new
-      @queue_mutex = Mutex.new
       initialize_metrics
     end
 
@@ -19,17 +26,20 @@ module SoarAuditingProvider
     end
 
     def enqueue(level, data)
-      @queue_mutex.synchronize {
-        raise AuditingOverflowError if @queue.size >= @maximum_queue_size
+      if @queue.size < @maximum_queue_size then
         @queue.push({:level => level, :data => data})
-        start
-      }
+      else
+        raise AuditingOverflowError
+      end
+      ensure_worker_is_running
     end
 
-    def start
+    def start(verbose: false)
       @start_mutex.synchronize {
-        @stopping = false
-        super if not running?
+        if not running? then
+          super()
+          $stderr.puts("Auditing worker was not running and respawned") if verbose
+        end
       }
     end
 
@@ -54,16 +64,11 @@ module SoarAuditingProvider
         failed_before = true
         retry
       end
-
-      @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
-      }
+      return false #indicates to thread worder that we are not done executing
     end
 
     def flush(timeout = 1)
-      start
+      ensure_worker_is_running
       wait_for_worker_to_clear_queue(timeout)
       fallback_flush_to_stderr if @queue.size > 0
     end
@@ -109,6 +114,10 @@ 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.4"
+  VERSION = "1.1.5"
 end

metadata

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