soar_sr 1.1.21 → 1.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 617a32c56c8657120779c8984dd64e30c3aa33c5
-  data.tar.gz: 85d0ece9ee75871b3a2a71b5fc7e11044c6458cb
+  metadata.gz: ec45c38cad8927ab5da79c5299c9e156b58fdd1b
+  data.tar.gz: a8311d31ea3e24dae061d8220610e14963a0f489
 SHA512:
-  metadata.gz: 8f78bfe17fa64cd8b0bb32be9d5d02bb6c1531cd2c77426560cd2c97ef8a93b21f57361d7a4e5b448ba1c783c80f49a425ecb66664c9bc2610dc72eb377d0180
-  data.tar.gz: 8bf59acbf23aa226059d3b4156f8a1deb3e0b6b54105a9f80cab4743a65546913975b49d39ba7413c22a101beeac1cb30abdd64a9598f75f0796371ee9b3bdea
+  metadata.gz: fe0624cd33ff382727c7a9115515ff6ee789f962bdce4ace07ef4dfe79ccabfcdd92b95c62a1ef25c338e5849dc9669d05ed91883c5d1757a43cca211a1da172
+  data.tar.gz: 14a2c86c5d25cebd7cb12df01e734353c8cf67b7c97afa1d9cdcccfe0c56f13349dd0819a4d57725430d6b9d3415cfcd40367ccc0b86ec5a707a0037e255cb33

data/README.md

@@ -29,7 +29,17 @@ Or install it yourself as:
 ### Helpers
 	  require 'soar_sr'
 	  credentials = { 'username' => 'uddi', 'password' => 'uddi' }
-	  freshness = 0 # > 0 to enable cache
+
+	  # Note: caching is pro-active, i.e. it will try and update once
+	  # the entry half-life has been exceeded, at which point
+	  # the entry freshness is reset. If update fails continuously or
+	  # an update thread worker is not available to perform the update,
+	  # or pro-active update is not triggered by a cache hit, once
+	  # freshness is exceeded, the entry is forgotten and results in
+	  # a new query to the registry on cache miss (potentially slow).
+	  # Update worker threads have a concurrency upper limit of 10
+	  freshness = 0 # > 0 to enable pro-active caching
+
 	  @soar_sr = SoarSr::ServiceRegistry.new('http://localhost:8080', 'hetzner.co.za', 'hetzner', credentials, freshness)
 	  ds = @soar_sr.domain_perspectives
 	  sv = @soar_sr.services
@@ -68,7 +78,7 @@ Or install it yourself as:
 	  sc.service_component_uri('my sc')
 	  sc.configure_meta_for_service_component('my sc', {'some' => 'meta'})
 	  sc.meta_for_service_component('my sc')
-	  sc.deregister_service_component('my sc')
+	  sc.deregister_service_component('my sc') # This action can take up to a minute
 
 ### Service definitions
 	  sd.register_service_definition('my service', 'http://github.com/myservice/def.wadl')

data/lib/soar_sr/domain_perspectives.rb

@@ -25,7 +25,7 @@ module SoarSr
 
     def list_domain_perspectives(domain_types = SoarSr::DOMAIN_TYPES)_{
       result = @uddi.find_businesses
-      result['data']['domain_perspectives'] = {}
+      result['data']['domain_perspectives'] ||= {}
 
       if has_data?(result, 'businesses')
         result['data']['businesses'].each do |business, detail|

data/lib/soar_sr/juddi_provider.rb

@@ -4,13 +4,16 @@ require 'persistent-cache'
 
 module SoarSr
   class JUDDIProvider
+    MAX_THREADS = 10 unless defined? MAX_THREADS; MAX_THREADS.freeze
     attr_reader :broker
     attr_reader :urns
     attr_reader :cache
+    attr_reader :cache_freshness
 
     def initialize(urns, broker, cache_freshness)
       @urns = urns
       @broker = broker
+      @cache_freshness = cache_freshness
       @cache = Persistent::Cache.new("uddi-broker", cache_freshness, Persistent::Cache::STORAGE_RAM)
     end
 
@@ -29,10 +32,10 @@ module SoarSr
     end
 
     def get_service(name)
-      cached = @cache["get_service:#{name}"]; return cached if cached
-      value = @broker.get_service_element(name, @urns['services'])
-      @cache["get_service:#{name}"] = value
-      value
+      key = "get_service:#{name}"
+      lookup_and_cache(key) do
+        @broker.get_service_element(name, @urns['services'])
+      end
     end
 
     def save_service(name, description = nil, definition = nil)
@@ -47,11 +50,10 @@ module SoarSr
 
     def find_services(pattern = nil)
       pattern = pattern.nil? ? '%' : "%#{pattern}%"
-
-      cached = @cache["find_services:#{pattern}"]; return cached if cached
-      value = @broker.find_services(pattern)
-      @cache["find_services:#{pattern}"] = value
-      value
+      key = "find_services:#{pattern}"
+      lookup_and_cache(key) do
+        @broker.find_services(pattern)
+      end
     end
 
     def add_service_uri(service, uri)
@@ -69,17 +71,17 @@ module SoarSr
     end
 
     def service_uris(service)
-      cached = @cache["service_uris:#{service}"]; return cached if cached
-      value = @broker.find_element_bindings(service, @urns['services'])
-      @cache["service_uris:#{service}"] = value
-      value
+      key = "service_uris:#{service}"
+      lookup_and_cache(key) do
+        @broker.find_element_bindings(service, @urns['services'])
+      end
     end
 
     def get_service_component(name)
-      cached = @cache["get_service_component:#{name}"]; return cached if cached
-      value = @broker.get_service_element(name, @urns['service-components'])
-      @cache["get_service_component:#{name}"] = value
-      value
+      key = "get_service_component:#{name}"
+      lookup_and_cache(key) do
+        @broker.get_service_element(name, @urns['service-components'])
+      end
     end
 
     def save_service_component(name, description = nil, definition = nil)
@@ -94,11 +96,10 @@ module SoarSr
 
     def find_service_components(pattern = nil)
       pattern = pattern.nil? ? '%' : "%#{pattern}%"
-      cached = @cache["find_service_components:#{pattern}"]; return cached if cached
-
-      value = @broker.find_service_components(pattern)
-      @cache["find_service_components:#{pattern}"] = value
-      value
+      key = "find_service_components:#{pattern}"
+      lookup_and_cache(key) do
+        @broker.find_service_components(pattern)
+      end
     end
 
     def save_service_component_uri(service_component, uri)
@@ -110,10 +111,10 @@ module SoarSr
     end
 
     def find_service_component_uri(service_component)
-      cached = @cache["find_service_component_uri:#{service_component}"]; return cached if cached
-      value = @broker.find_element_bindings(service_component, @urns['service-components'])
-      @cache["find_service_component_uri:#{service_component}"] = value
-      value
+      key = "find_service_component_uri:#{service_component}"
+      lookup_and_cache(key) do
+        @broker.find_element_bindings(service_component, @urns['service-components'])
+      end
     end
 
     def save_business(key, name, description = nil, contacts = nil)
@@ -121,19 +122,19 @@ module SoarSr
       @broker.save_business(key, name, description, contacts)
     end
 
-    def get_business(key)
-      cached = @cache["get_business:#{key}"]; return cached if cached
-      value = @broker.get_business(key)
-      @cache["get_business:#{key}"] = value
-      value
+    def get_business(business_key)
+      key = "get_business:#{business_key}"
+      lookup_and_cache(key) do
+        @broker.get_business(business_key)
+      end
     end
 
     def find_businesses(pattern = nil)
       pattern = pattern.nil? ? '%' : "%#{pattern}%"
-      cached = @cache["find_businesses:#{pattern}"]; return cached if cached
-      value = @broker.find_business(pattern)
-      @cache["find_businesses:#{pattern}"] = value
-      value
+      key = "find_businesses:#{pattern}"
+      lookup_and_cache(key) do
+        @broker.find_business(pattern)
+      end
     end
 
     def delete_business(key)
@@ -143,6 +144,44 @@ module SoarSr
 
     private
 
+    def lookup_and_cache(key, &block)
+      cached, refresh = lookup_and_refresh(key)
+      refresh_entry(key) do
+        block.call
+      end if refresh
+      return cached if cached
+      value = block.call
+      @cache[key] = value
+      value
+    end
+
+    def refresh_entry(key, &block)
+      return if Thread.list.size > MAX_THREADS
+      Thread.new do
+        begin
+          # thread-safety not important. no mutexes required
+          # we do not mind service stale cache values on
+          # race conditions, since we refresh on half-life
+          # of freshness on a best-effort basis
+          value = block.call
+          @cache[key] = value
+        rescue => ex
+          # do not update
+        end
+      end
+    end
+
+    def lookup_and_refresh(key)
+      timestamp = @cache.timestamp?(key)
+      halflife = @cache_freshness / 2
+      refresh = false
+      if (halflife > 0) and (timestamp)
+        refresh = (Time.now - timestamp) > halflife
+      end
+
+      return @cache[key], refresh
+    end
+
     def delete_existing_bindings(bindings)
       bindings.each do |binding, detail|
         @broker.delete_binding(binding)

data/lib/soar_sr/version.rb

@@ -1,3 +1,3 @@
 module SoarSr
-  VERSION = "1.1.21"
+  VERSION = "1.1.22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soar_sr
 version: !ruby/object:Gem::Version
-  version: 1.1.21
+  version: 1.1.22
 platform: ruby
 authors:
 - Ernst van Graan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: persistent-cache-ram