soar_auditing_provider 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa21dcc13f23cdb76ed8a5e73fe8a61e55e31613
-  data.tar.gz: c9817e2b952fab882ed024dcdc6a41db402f4454
+  metadata.gz: 0f14d5868f0105a39ea7c8f63f42084861fb3051
+  data.tar.gz: 96645fed67236c12fd3be8fb6595a7510a129a5e
 SHA512:
-  metadata.gz: d09d988d482f05af2a3fef01e46d00e96195ea88411877d71859927ccc149953ea17dd75a847bd74846809991bd08275364d6f3772cfb271485c78f9ce39c3ab
-  data.tar.gz: 91a9f79b34e03b04a5167553db5690286681c276b474069503f2e54b981283de7730dc73b4c08164864600e9f0e2f72741e97e8e96ce6f854a9859cc7f918de6
+  metadata.gz: 830824ca942484ef3b0c7afb6ef2bc55c8fbe2594397a748ba1c09d11be6afdb398dd1676a0dfc24e85d7f49c196ec7f2dea35bc4fa98bbe4b2ab2a7b8c6427c
+  data.tar.gz: 0b0fe84d33b7bf79506fcfdcaebae9877fc037ea92a27f66bc44b00bdaaed950ea7bff375a276f8c25d1935ebf42451e2e956b673a10bff05b3987a9c60fbd68

data/lib/soar_auditing_provider/auditing_provider.rb

@@ -20,17 +20,22 @@ module SoarAuditingProvider
 
     DEFAULT_FLOW_ID_GENERATOR = -> { SoarFlow::ID::generate_flow_id } unless defined?(DEFAULT_FLOW_ID_GENERATOR)
     DEFAULT_LEVEL = :info unless defined?(DEFAULT_LEVEL)
+    DEFAULT_QUEUE_WORKER_CONFIG = {
+      "queue_size" => 1000,
+      "initial_back_off_in_seconds" => 1,
+      "back_off_multiplier" => 2,
+      "back_off_attempts" => 5
+    } unless defined?(DEFAULT_QUEUE_WORKER_CONFIG)
 
     attr_accessor :service_identifier
     attr_reader   :configuration
     attr_writer   :startup_flow_id
 
     def initialize(configuration)
-      validate_provider_configuration(configuration)
       @configuration = configuration
-      @flow_id_generator = @configuration["flow_id_generator"] || DEFAULT_FLOW_ID_GENERATOR
       super(create_auditors(configuration))
       select_auditor(configuration['default_nfrs'])
+      @flow_id_generator = @configuration["flow_id_generator"] || DEFAULT_FLOW_ID_GENERATOR
       create_auditing_worker
       @buffer_overflow_count = 0
       install_at_exit_handler
@@ -145,18 +150,15 @@ module SoarAuditingProvider
       @buffer_overflow_count += 1
     end
 
-    def validate_provider_configuration(configuration)
-      raise 'queue_worker required when direct_auditor_call is false' if configuration['direct_auditor_call'] != 'true' and !configuration['queue_worker']
-    end
-
     def format(level, data, flow_identifier)
       SoarAuditingFormatter::Formatter.format(level,@service_identifier,flow_identifier,Time.now.utc.iso8601(3),data)
     end
 
     def create_auditing_worker
-      if 'true' != @configuration['direct_auditor_call']
+      if !direct_auditor_call?
+        config =  @configuration['queue_worker'] || DEFAULT_QUEUE_WORKER_CONFIG
         @worker = AuditingWorker.instance
-        @worker.configure(queue_worker_configuration: @configuration['queue_worker'], auditor_audit_method: method(:super_class_caller))
+        @worker.configure(queue_worker_configuration: config, auditor_audit_method: method(:super_class_caller))
         @worker.start
       else
         @worker = nil
@@ -188,6 +190,11 @@ module SoarAuditingProvider
       raise
     end
 
+    def direct_auditor_call?(configuration = @configuration)
+      configuration['direct_auditor_call'] == 'true' or
+        (configuration['direct_auditor_call'].nil? and @auditor.respond_to?(:prefer_direct_call?) and @auditor.prefer_direct_call?)
+    end
+
     def initialize_metrics
       @startup_timestamp     = Time.now.utc.iso8601(3)
       @enqueued_audit_events = 0

data/lib/soar_auditing_provider/version.rb

@@ -1,3 +1,3 @@
 module SoarAuditingProvider
-  VERSION = "1.8.0"
+  VERSION = "1.9.0"
 end

data/soar_auditing_provider.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'soar_xt', '~> 0.0.3'
 
   spec.add_dependency 'soar_auditing_provider_api', '~> 0.9.0'
+  spec.add_dependency 'soar_auditor_api', '~> 0.0'
   spec.add_dependency 'soar_auditing_format', '~> 0.0.5'
   spec.add_dependency 'soar_flow', '~> 0.1.1'
   spec.add_dependency 'soar_thread_worker', '~> 0.2.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soar_auditing_provider
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Ernst van Graan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,6 +109,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: soar_auditor_api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: soar_auditing_format
   requirement: !ruby/object:Gem::Requirement