soar_sc_core 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 493ffc8bb6a76956d2e60b63a2288adcf018b5d7
-  data.tar.gz: 1c342973c86b8dbd54eddd47b756224fe8f56321
+  metadata.gz: c6d53da3c35fdb6e5a17284f7acddce410943cd2
+  data.tar.gz: cacb2344be187c21166e5ad14e5dc269fb7de07c
 SHA512:
-  metadata.gz: df555dd5eafa6fc99f54e84981cd84620718cd8d7d79a11a9009f67221698b6f849fb1ba1be09a2fe413714b5179e2c358b4db9ab031599bc73549a16c0c6deb
-  data.tar.gz: 8c94bf377246c090f2c2813ec77ab976f1c8d342ce072a531e3486debe941a01a86f46b78a2a4e8aceb27429e875a9c63af92338a39045f062276245c756c723
+  metadata.gz: 37369d0e7cbf98d71fd09cc9cd79e10c1c3cb694521a492622b6ecf35fdfba82a8555a12f968816aa915272f2cebb3ee5d906207f7386686110650407384ca90
+  data.tar.gz: dd1daeec5c39e124a62c1b51f02026124e41850bf994e04265608a2ff81f26734019976094025aa9184e13311b710d0e90fb2859f93c469741686ebefc03b7cc

data/lib/providers/service_registry.rb

@@ -3,14 +3,20 @@ module SoarSc
     class ServiceRegistry
       def self.bootstrap(config)
         begin
-          credentials = { 'username' => 'uddi', 'password' => 'read-only' }
-          registry = config['service_registry']['uri'] if config['service_registry']
-          registry = SoarSc::environment['SERVICE_REGISTRY'] if SoarSc::environment['SERVICE_REGISTRY']
-          SoarSc::auditing.info("Using registry at [#{registry}]",SoarSc::startup_flow_id)
-          SoarSc::auditing.error("No service registry! Missing service registry URI",SoarSc::startup_flow_id) if ((registry.nil?) or ('' == registry))
-          freshness = 3600
-          freshness = config['service_registry']['freshness'] if config['service_registry'] and config['service_registry']['freshness']
-          SoarSc::service_registry = SoarSr::ServiceRegistry.new(registry, 'hetzner.co.za', 'hetzner', credentials, freshness)
+          if SoarSc::dependencies.include?("service_registry")
+            SoarSc::auditing.info("Using registry from configured dependencies", SoarSc::startup_flow_id)
+            SoarSc::service_registry = SoarSc::dependencies["service_registry"]
+          else
+            credentials = { 'username' => 'uddi', 'password' => 'read-only' }
+            registry = config['service_registry']['uri'] if config['service_registry']
+            registry = SoarSc::environment['SERVICE_REGISTRY'] if SoarSc::environment['SERVICE_REGISTRY']
+            SoarSc::auditing.info("Using registry at [#{registry}]",SoarSc::startup_flow_id)
+            SoarSc::auditing.error("No service registry! Missing service registry URI",SoarSc::startup_flow_id) if ((registry.nil?) or ('' == registry))
+            freshness = 3600
+            freshness = config['service_registry']['freshness'] if config['service_registry'] and config['service_registry']['freshness']
+            SoarSc::service_registry = SoarSr::ServiceRegistry.new(registry, 'hetzner.co.za', 'hetzner', credentials, freshness)
+          end
+
           config['service_registry']['warm_up'].each do |service_identifier|
             SoarSc::auditing.info("SoarSc::Provider::ServiceRegistry Warming up #{service_identifier}",SoarSc::startup_flow_id)
             SoarSc::service_registry.services.service_by_name(service_identifier)

data/lib/soar_sc_core/version.rb

@@ -1,3 +1,3 @@
 module SoarScCore
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/lib/soar_sc_core.rb

@@ -42,6 +42,7 @@ def require_auth
 end
 
 def require_models
+  require 'soar/dependency_container'
   require 'soar_configured_factory'
   Dir["#{Dir.pwd}/lib/web/models/*.rb"].each {|file| require file }
 end
@@ -138,8 +139,6 @@ module SoarSc
     end
 
     @dependencies
-  rescue
-    return nil
   end
 
   def self.bootstrap_sessions(stack)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soar_sc_core
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Ernst Van Graan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml