soar_auditing_provider 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df131b281699cdc2eddac9b0afc0765f15363fb1
-  data.tar.gz: 9ef206637e1d09ef928c6b02c712051b6f47d86d
+  metadata.gz: acb15ef52a97ecdc11189901877a4111ce3951cb
+  data.tar.gz: 4c61680ebb1297cd2566586abdb1378870323ca9
 SHA512:
-  metadata.gz: 5d9f18bbc8a4c529066e6373052b29c3c00be530b839cc9e657909b8a4d771df2b07a780076b7036ad0a71254b5562c4db30aeeff58f235b41ec9434bbe5d503
-  data.tar.gz: 41aa9185c50b3c5093806957131ff8e4305486f0f09a695cd32a375093b2ca7c0e1306ee08e76dd85dd5ebcc7d8e1711aa9d09546a1f593b41f7e581048c470d
+  metadata.gz: 495a6b27261159f6b4d73241db05e70a56bcef0f004d8c172aa386474e10e9135c9494c597b8fcf26c43e0cf0e1600d258806121682683bbe285a645d3879271
+  data.tar.gz: a01384116b2f274a6baf1e6e126371025eb1aa3f219aef3c6cb01948d766cac5d129034abce0f99452557fed5cc1f6a67a871615b4c60648760021f5140f2bde

data/lib/soar_auditing_provider/auditing_provider.rb

@@ -17,6 +17,8 @@ module SoarAuditingProvider
 
     public
 
+    DEFAULT_FLOW_ID_GENERATOR = -> { SoarFlow::ID::generate_flow_id } unless defined?(DEFAULT_FLOW_ID_GENERATOR)
+
     attr_accessor :startup_flow_id
     attr_accessor :service_identifier
     attr_reader   :configuration
@@ -24,6 +26,7 @@ module SoarAuditingProvider
     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'])
       create_auditing_worker
@@ -45,27 +48,25 @@ module SoarAuditingProvider
     end
 
     def debug(data, flow_identifier = nil)
-      audit(:debug, format(:debug, prepend_caller_information(data), flow_identifier))
+      audit(:debug, data, flow_identifier)
     end
 
     def info(data, flow_identifier = nil)
-      audit(:info, format(:info, prepend_caller_information(data), flow_identifier))
+      audit(:info, data, flow_identifier)
     end
 
+    alias_method :<<, :info
+
     def warn(data, flow_identifier = nil)
-      audit(:warn, format(:warn, prepend_caller_information(data), flow_identifier))
+      audit(:warn, data, flow_identifier)
     end
 
     def error(data, flow_identifier = nil)
-      audit(:error, format(:error, prepend_caller_information(data), flow_identifier))
+      audit(:error, data, flow_identifier)
     end
 
     def fatal(data, flow_identifier = nil)
-      audit(:fatal, format(:fatal, prepend_caller_information(data), flow_identifier))
-    end
-
-    def <<(data, flow_identifier = nil)
-      audit(:info, format(:info, prepend_caller_information(data), flow_identifier))
+      audit(:fatal, data, flow_identifier)
     end
 
     def detailed_status
@@ -110,7 +111,13 @@ module SoarAuditingProvider
       flush
     end
 
-    def audit(level, data)
+    def audit(level, data, flow_identifier = nil)
+      flow_identifier ||= @flow_id_generator.call
+      formatted_data = format(level, prepend_caller_information(data), flow_identifier)
+      audit_formatted(level, formatted_data)
+    end
+
+    def audit_formatted(level, data)
       if 'true' == @configuration['direct_auditor_call']
         super_class_caller(level, data)
       else

data/lib/soar_auditing_provider/version.rb

@@ -1,3 +1,3 @@
 module SoarAuditingProvider
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/soar_auditing_provider.gemspec

@@ -23,11 +23,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'byebug', '~> 9.0.5'
   spec.add_development_dependency 'log4r_auditor', '~> 1.0.0'
-  spec.add_development_dependency 'soar_flow', '~> 0.1.1'
   spec.add_development_dependency 'soar_xt', '~> 0.0.3'
 
   spec.add_dependency 'soar_auditing_provider_api', '~> 0.9.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'
   spec.add_dependency 'soar_configured_factory', '~> 0.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soar_auditing_provider
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Ernst van Graan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,61 +82,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: soar_flow
+  name: soar_xt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
-  name: soar_xt
+  name: soar_auditing_provider_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
-  type: :development
+        version: 0.9.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
-  name: soar_auditing_provider_api
+  name: soar_auditing_format
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
-  name: soar_auditing_format
+  name: soar_flow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: soar_thread_worker
   requirement: !ruby/object:Gem::Requirement
@@ -223,3 +223,4 @@ signing_key:
 specification_version: 4
 summary: SOAR architecture auditing provider
 test_files: []
+has_rdoc: