prefab-cloud-ruby 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21650fb9bfd13dc3d1b8e0e2a6c826e97ff8cce9
-  data.tar.gz: 502213b0d3394afb96427fb54a52113d7672981d
+  metadata.gz: 214acdf959717e10b66a8e6df483365a4283d093
+  data.tar.gz: afabe80e96eac0f0a563fdb4a403a1038a41cb80
 SHA512:
-  metadata.gz: 7364cfd35d713e3144bb6fbcabe89807c92dad4e1a06523d717e23ee2dfa78a227f64b2e9e9668306ed23fca1c250331fc263a52021881a9c3218c5d62585f9b
-  data.tar.gz: 1546ee4f08a823292765fb322ad922d2b87892276d034fdcaec1ba4cddb29c4100d4f8863c5bbef10960cda0b18eae4e4933e5398170b2394b4f9f2c16c7195c
+  metadata.gz: e775bbfa7e80a1a578b89bedc01c456d052cb164745c9d151597764e0519d759d2ae041d6efa974fb410d5d9727d590fe83d64b4f7b2342d0597447ffa2c09c6
+  data.tar.gz: 647786436076bf00240175dcaef26beb4f7fb82b99fcef382e6838da8c0762b5416c980dcae9d7c2482a9773929d1f7c33bfb8e085b3d6f2c93c19ef635b0b98

data/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gem 'concurrent-ruby', '~> 1.0', '>= 1.0.5'
 gem 'faraday'
-gem 'grpc', '~> 1.17.1'
+gem 'grpc', '~> 1.18.0'
 
 group :development do
   gem 'grpc-tools', '~> 1.17.1'

data/Gemfile.lock

@@ -23,9 +23,9 @@ GEM
       hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
     google-protobuf (3.6.1)
-    googleapis-common-protos-types (1.0.2)
+    googleapis-common-protos-types (1.0.3)
       google-protobuf (~> 3.0)
-    grpc (1.17.1)
+    grpc (1.18.0)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
     grpc-tools (1.17.1)
@@ -91,7 +91,7 @@ DEPENDENCIES
   bundler (~> 1.0)
   concurrent-ruby (~> 1.0, >= 1.0.5)
   faraday
-  grpc (~> 1.17.1)
+  grpc (~> 1.18.0)
   grpc-tools (~> 1.17.1)
   juwelier (~> 2.4.9)
   rdoc (~> 3.12)

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/prefab/cancellable_interceptor.rb

@@ -1,8 +1,26 @@
 module Prefab
   class CancellableInterceptor < GRPC::ClientInterceptor
+    WAIT_SEC = 3
+
+    def initialize(base_client)
+      @base_client = base_client
+    end
 
     def cancel
       @call.instance_variable_get("@wrapped").instance_variable_get("@call").cancel
+      i = 0
+      while (i < WAIT_SEC) do
+        if @call.instance_variable_get("@wrapped").cancelled?
+          @base_client.log_internal Logger::DEBUG, "Cancelled streaming."
+          return
+        else
+          @base_client.log_internal Logger::DEBUG, "Unable to cancel streaming. Trying again"
+          @call.instance_variable_get("@wrapped").instance_variable_get("@call").cancel
+          i += 1
+          sleep(1)
+        end
+      end
+      @base_client.log_internal Logger::INFO, "Unable to cancel streaming."
     end
 
     def request_response(request:, call:, method:, metadata:, &block)

data/lib/prefab/config_client.rb

@@ -16,7 +16,7 @@ module Prefab
 
       @initialization_lock.acquire_write_lock
 
-      @cancellable_interceptor = Prefab::CancellableInterceptor.new
+      @cancellable_interceptor = Prefab::CancellableInterceptor.new(@base_client)
 
       @s3_cloud_front = ENV["PREFAB_S3CF_BUCKET"] || DEFAULT_S3CF_BUCKET
       load_checkpoint
@@ -24,10 +24,7 @@ module Prefab
     end
 
     def start_streaming
-      at_exit do
-        @cancellable_interceptor.cancel
-      end
-
+      @streaming = true
       start_api_connection_thread(@config_loader.highwater_mark)
     end
 
@@ -160,8 +157,14 @@ module Prefab
                                                     start_at_id: start_at_id)
       @base_client.log_internal Logger::DEBUG, "start api connection thread #{start_at_id}"
       @base_client.stats.increment("prefab.config.api.start")
+
       @api_connection_thread = Thread.new do
-        while true do
+        at_exit do
+          @streaming = false
+          @cancellable_interceptor.cancel
+        end
+
+        while @streaming do
           begin
             resp = stub.get_config(config_req)
             resp.each do |r|
@@ -172,13 +175,16 @@ module Prefab
               finish_init!(:streaming)
             end
           rescue => e
-            level = e.code == 1 ? Logger::DEBUG : Logger::INFO
-            @base_client.log_internal level, ("config client encountered #{e.message} pausing #{RECONNECT_WAIT}")
-            reset
-            sleep(RECONNECT_WAIT)
+            if @streaming
+              level = e.code == 1 ? Logger::DEBUG : Logger::INFO
+              @base_client.log_internal level, ("config client encountered #{e.message} pausing #{RECONNECT_WAIT}")
+              reset
+              sleep(RECONNECT_WAIT)
+            end
           end
         end
       end
+
     end
   end
 end

data/prefab-cloud-ruby.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: prefab-cloud-ruby 0.5.0 ruby lib
+# stub: prefab-cloud-ruby 0.5.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -62,7 +62,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<concurrent-ruby>.freeze, [">= 1.0.5", "~> 1.0"])
       s.add_runtime_dependency(%q<faraday>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<grpc>.freeze, ["~> 1.17.1"])
+      s.add_runtime_dependency(%q<grpc>.freeze, ["~> 1.18.0"])
       s.add_development_dependency(%q<grpc-tools>.freeze, ["~> 1.17.1"])
       s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
       s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
@@ -72,7 +72,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<concurrent-ruby>.freeze, [">= 1.0.5", "~> 1.0"])
       s.add_dependency(%q<faraday>.freeze, [">= 0"])
-      s.add_dependency(%q<grpc>.freeze, ["~> 1.17.1"])
+      s.add_dependency(%q<grpc>.freeze, ["~> 1.18.0"])
       s.add_dependency(%q<grpc-tools>.freeze, ["~> 1.17.1"])
       s.add_dependency(%q<shoulda>.freeze, [">= 0"])
       s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
@@ -83,7 +83,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<concurrent-ruby>.freeze, [">= 1.0.5", "~> 1.0"])
     s.add_dependency(%q<faraday>.freeze, [">= 0"])
-    s.add_dependency(%q<grpc>.freeze, ["~> 1.17.1"])
+    s.add_dependency(%q<grpc>.freeze, ["~> 1.18.0"])
     s.add_dependency(%q<grpc-tools>.freeze, ["~> 1.17.1"])
     s.add_dependency(%q<shoulda>.freeze, [">= 0"])
     s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prefab-cloud-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Jeff Dwyer
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.1
+        version: 1.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.1
+        version: 1.18.0
 - !ruby/object:Gem::Dependency
   name: grpc-tools
   requirement: !ruby/object:Gem::Requirement