soar_sc_core 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfd19c51450af833abc4c7842f881c85b06cedb0
-  data.tar.gz: 161bfc7806a5cfb3442941cd541603cf130b116c
+  metadata.gz: 28ce256017213102dc7fcd0b7b35dd03277f6131
+  data.tar.gz: f33a6116ca46e1ff2b35a60c54f455cfc76a8a9e
 SHA512:
-  metadata.gz: 16949d1454c98b4d60de057cc5f464a0855d346d5f6fe7ad8bc68cf819f39bc9d738f224b81ab6aa7537fd3305a32a3a9cce3cfa9882e70cc7c09053997d0035
-  data.tar.gz: 553a0b789e4bf4e5ea7177751a0b5f643dd73ecc46971a345934218e7e9b897ea97dc731c9cf6dd3a2c3c77b5e41e6c98bb26482201f8913c42f03b480c19739
+  metadata.gz: 9047ae5930055cdfdba4c79cb84542bb4a549ba228fb3a7874ffb18180361f2bbd376ddc1e10f68877b5d63fd5d6874c609c351f22260321636abfbbf73eb0b1
+  data.tar.gz: ce7ca02db2bef1d79cc96e7bc6a52fcaa6159e916bc9f741f288a66cb0b613046460d2075625ee2fe41c2218aa9a3049b30c78a89c39dc9c0ef7ee8678faa7c4

data/lib/providers/auditing.rb

@@ -56,23 +56,20 @@ module SoarSc
         }
       } unless defined? DEFAULT_AUDITING_CONFIGURATION; DEFAULT_AUDITING_CONFIGURATION.freeze
 
-      def self.bootstrap(configuration, initialize_with_identifier = false)
+      def self.bootstrap(configuration, external_auditor = nil)
         begin
-          merged_configuration = self.merge_configuration_with_auditing_defaults(configuration)
-          self.validate_auditing_provider_configuration(merged_configuration['auditing'])
-          if initialize_with_identifier
-            SoarSc::auditing = SoarSc::Providers.const_get(merged_configuration['auditing']['provider'])
-                                  .new(merged_configuration['auditing'],
-                                       SoarSc::environment['IDENTIFIER'])
+          if external_auditor
+            SoarSc::auditing = external_auditor
           else
-            SoarSc::auditing = SoarSc::Providers.const_get(merged_configuration['auditing']['provider'])
-                                  .new(merged_configuration['auditing'])
+            configuration = self.merge_configuration_with_auditing_defaults(configuration)
+            self.validate_auditing_provider_configuration(merged_configuration['auditing'])
+            SoarSc::auditing = SoarSc::Providers.const_get(merged_configuration['auditing']['provider']).new(merged_configuration['auditing'])
             SoarSc::auditing.service_identifier = SoarSc::environment['IDENTIFIER']
+            SoarStatus::Status.register_detailed_status_provider('auditing',SoarSc::auditing)
           end
           self.generate_instance_flow_id
           self.bootstrap_analytics
-          SoarStatus::Status.register_detailed_status_provider('auditing',SoarSc::auditing)
-          merged_configuration
+          configuration
         rescue
           $stderr.puts 'Failure initializing auditing provider'
           raise

data/lib/soar_sc_core/version.rb

@@ -1,3 +1,3 @@
 module SoarScCore
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soar_sc_core
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Ernst Van Graan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml