prefab-cloud-ruby 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa167019e6d70cdde48a87afc80b4363eca3d3d9
-  data.tar.gz: 761b554954582f17a31ab902bd02eb6b856df250
+  metadata.gz: 4b7a0a43eadc51e6ebfbd7573865ba48dd139bd1
+  data.tar.gz: 30e99adf8c06969e29034fbff3a711838b471e0a
 SHA512:
-  metadata.gz: 0cdfd19ee6df21bddb493d4cfbf95434c6d5c3d89065c115465db6a3298caff128a5734fae7dee0df26fe1e113229710b2371324afa7b1472b347eebc26fe7e1
-  data.tar.gz: f5945febd993742430b3ff909d3d27d306d171e542bd336408a70adfea705267e46f12c95eb0bb4cb411154e276dd808b1a84a55e214e9d735d94797534b0916
+  metadata.gz: 29262f1a91dd5c7322152e27fe4352c4a6974f17d891f29bdaed79aedda4c258c13ba4576337936d6b5fcf7b22a3a0eb793e1a4ce9b1b1185dac95e9f88bb352
+  data.tar.gz: cf12cc1441b1a8786f40cf309128129570fe061b9eb41a1c59ed8cc0159a54376cd3711809e4e76f52edefecccb5409b59c3d37ce7997bd38d1ee5da7801c1ad

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/prefab/client.rb

@@ -1,6 +1,6 @@
 module Prefab
   class Client
-    attr_reader :account_id, :shared_cache, :stats, :namespace, :logger
+    attr_reader :account_id, :shared_cache, :stats, :namespace, :logger, :creds, :channel, :interceptor
 
     def initialize(api_key:,
                    logger: nil,
@@ -26,22 +26,12 @@ module Prefab
       end
     end
 
-    def config_client(timeout: 10.0)
-      @config_client ||= Prefab::ConfigClient.new(Prefab::ConfigService::Stub.new(nil,
-                                                                                  @creds,
-                                                                                  channel_override: @channel,
-                                                                                  timeout: timeout,
-                                                                                  interceptors: [@interceptor]),
-                                                  self)
+    def config_client(timeout: 5.0)
+      @config_client ||= Prefab::ConfigClient.new(self, timeout)
     end
 
     def ratelimit_client(timeout: 5.0)
-      @ratelimit_client ||= Prefab::RateLimitClient.new(Prefab::RateLimitService::Stub.new(nil,
-                                                                                           @creds,
-                                                                                           channel_override: @channel,
-                                                                                           timeout: timeout,
-                                                                                           interceptors: [@interceptor]),
-                                                        self)
+      @ratelimit_client ||= Prefab::RateLimitClient.new(self, timeout)
     end
 
     private

data/lib/prefab/config_client.rb

@@ -1,37 +1,61 @@
 module Prefab
   class ConfigClient
-    def initialize(config_service, client)
+    RECONNECT_WAIT = 5
+
+    def initialize(client, timeout)
       @client = client
-      @config_service = config_service
+      @timeout = timeout
       @config_resolver = EzConfig::ConfigResolver.new(client)
-      boot_resolver(@config_service)
+      boot_resolver
     end
 
     def get(prop)
       @config_resolver.get(prop)
     end
 
-    def set(config_value)
-      @config_service.upsert(config_value)
+    def set(config_delta)
+      Retry.it method(:stub_with_timout), :upsert, config_delta, @timeout
+    end
+
+    def to_s
+      @config_resolver.to_s
     end
 
     private
 
-    def boot_resolver(config_service)
-      config_req = Prefab::ConfigServicePointer.new(account_id: 1,
+    def stub
+      Prefab::ConfigService::Stub.new(nil,
+                                      nil,
+                                      channel_override: @client.channel,
+                                      interceptors: [@client.interceptor])
+    end
+
+    def stub_with_timout
+      Prefab::ConfigService::Stub.new(nil,
+                                      nil,
+                                      channel_override: @client.channel,
+                                      timeout: @timeout,
+                                      interceptors: [@client.interceptor])
+    end
+
+    def boot_resolver
+      config_req = Prefab::ConfigServicePointer.new(account_id: @client.account_id,
                                                     start_at_id: 0)
 
       Thread.new do
-        begin
-          resp = config_service.get_config(config_req)
-          resp.each do |r|
-            r.deltas.each do |delta|
-              @config_resolver.set(delta)
+        while true do
+          begin
+            resp = stub.get_config(config_req)
+            resp.each do |r|
+              r.deltas.each do |delta|
+                @config_resolver.set(delta)
+              end
+              @config_resolver.update
             end
-            @config_resolver.update
+          rescue => e
+            sleep(RECONNECT_WAIT)
+            @client.logger.info("config client encountered #{e.message} pausing #{RECONNECT_WAIT}")
           end
-        rescue => e
-          @client.logger.warn(e)
         end
       end
     end

data/lib/prefab/config_resolver.rb

@@ -6,19 +6,34 @@ module EzConfig
       @local_store = {}
       @namespace = client.namespace
       @config_loader = EzConfig::ConfigLoader.new(client.logger)
+      @logger = client.logger
       make_local
     end
 
+    def to_s
+      str = ""
+      @lock.with_read_lock do
+        @local_store.each do |k, v|
+          value = v[:value]
+          case value.type
+          when :string then
+            str << "#{k} #{value.string}"
+          when :int then
+            str << "#{k} #{value.int}"
+          end
+        end
+      end
+      str
+    end
+
     def get(property)
       value = @lock.with_read_lock do
         @local_store[property][:value]
       end
       case value.type
       when :string then
-        puts "SSString"
         value.string
       when :int then
-        puts "INT"
         value.int
       end
     end
@@ -53,12 +68,12 @@ module EzConfig
             store[property] = { namespace: namespace, value: value }
           end
         end
-
-        puts "prop #{property} namespace #{namespace} value #{value}"
       end
       @lock.with_write_lock do
         @local_store = store
       end
+
+      @logger.info "Updated to #{to_s}"
     end
   end
 end

data/lib/prefab/ratelimit_client.rb

@@ -1,7 +1,8 @@
 module Prefab
   class RateLimitClient
-    def initialize(ratelimit_service, client)
-      @ratelimit_service = ratelimit_service
+
+    def initialize(client, timeout)
+      @timeout = timeout
       @client = client
     end
 
@@ -25,10 +26,10 @@ module Prefab
         allow_partial_response: allow_partial_response
       )
 
-      result = @ratelimit_service.limit_check(req)
+      result = Retry.it(method(:stub), :limit_check, req, @timeout)
 
       reset = result.limit_reset_at
-      @client.shared_cache.write(expiry_cache_key, reset) unless reset < 1
+      @client.shared_cache.write(expiry_cache_key, reset) unless reset < 1 # protobuf default int to 0
 
       @client.stats.increment("prefab.ratelimit.limitcheck", tags: ["policy_group:#{result.policy_group}", "pass:#{result.passed}"])
 
@@ -40,8 +41,17 @@ module Prefab
 
     private
 
+    def stub
+      Prefab::RateLimitService::Stub.new(nil,
+                                         nil,
+                                         channel_override: @client.channel,
+                                         timeout: @timeout,
+                                         interceptors: [@client.interceptor])
+    end
+
     def handle_error(e, on_error, groups)
       @client.stats.increment("prefab.ratelimit.error", tags: ["type:limit"])
+
       message = "ratelimit for #{groups} error: #{e.message}"
       case on_error
       when :log_and_pass

data/lib/prefab/retry.rb

@@ -0,0 +1,26 @@
+class Retry
+  DEFAULT_TIMEOUT = 10
+  MAX_SLEEP_SEC = 10
+  BASE_SLEEP_SEC = 0.5
+
+  # GRPC Generally handles timeouts for us
+  # but if the connection is broken we want to retry up until the timeout
+  def self.it(stub_factory, rpc, req, timeout)
+    attempts = 0
+    start_time = Time.now
+
+    begin
+      attempts += 1
+
+      return stub_factory.call.send(rpc, req)
+    rescue => exception
+      raise exception if Time.now - start_time > timeout
+
+      sleep_seconds = [BASE_SLEEP_SEC * (2 ** (attempts - 1)), MAX_SLEEP_SEC].min
+      sleep_seconds = sleep_seconds * (0.5 * (1 + rand()))
+      sleep_seconds = [BASE_SLEEP_SEC, sleep_seconds].max
+      sleep sleep_seconds
+      retry
+    end
+  end
+end

data/lib/prefab-cloud-ruby.rb

@@ -11,4 +11,5 @@ require 'prefab/config_client'
 require 'prefab/auth_interceptor'
 require 'prefab/noop_cache'
 require 'prefab/noop_stats'
+require 'prefab/retry'
 

data/prefab-cloud-ruby.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: prefab-cloud-ruby 0.0.7 ruby lib
+# stub: prefab-cloud-ruby 0.0.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Jeff Dwyer".freeze]
-  s.date = "2017-12-19"
+  s.date = "2017-12-22"
   s.description = "RateLimits & Config as a service".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.extra_rdoc_files = [
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "lib/prefab/noop_cache.rb",
     "lib/prefab/noop_stats.rb",
     "lib/prefab/ratelimit_client.rb",
+    "lib/prefab/retry.rb",
     "lib/prefab/store.rb",
     "lib/prefab_pb.rb",
     "lib/prefab_services_pb.rb",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefab-cloud-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc
@@ -151,6 +151,7 @@ files:
 - lib/prefab/noop_cache.rb
 - lib/prefab/noop_stats.rb
 - lib/prefab/ratelimit_client.rb
+- lib/prefab/retry.rb
 - lib/prefab/store.rb
 - lib/prefab_pb.rb
 - lib/prefab_services_pb.rb