prefab-cloud-ruby 0.1.0.alpha.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6110ec98aca7e02107488ae5e1e8d3ca54d20a4
-  data.tar.gz: e2eec0324a91dc71ceb13e16cc757d33afa59d47
+  metadata.gz: 94cbcb0db8e1be133abd5efbc497294d71eec1b4
+  data.tar.gz: e2f60e29eed939c71fc4af3182b71bd6d0142536
 SHA512:
-  metadata.gz: b9c1a27e9505dd06b7d24a8ed82f72b99cd5867707f951ef9f45104c745d8b4560f3b3eae29fcd239a68c3ffec7901107dfb2b8730361c9fba28db72b03d6d8a
-  data.tar.gz: 49365d95c9fb9d3192d62d303e59c93d7d64e400da530819d91a9fd889283e92da64678709942237cba78c493d279c606204dfd2e044dca67aaf5b1d4c40f1ee
+  metadata.gz: 7594ed51141560a0b56cba64a5fe70cf85afd573cf1c2eeb5a313099b95e15fa75dad118e7e48ad269dacb790adb8d8a30419f8cdaf02dfebcf038b7b68ba77f
+  data.tar.gz: 7ad375b5f83327dd58ecd063fe1c094c0e471189cf274165e59936f1ac416c515bbceecd8753f3652d6d2d0a5ebb9dcdf70993ad5804edf5fa4d14214650d2a5

data/Gemfile.lock

@@ -105,6 +105,7 @@ DEPENDENCIES
   aws-sdk-s3 (~> 1)
   bundler (~> 1.0)
   concurrent-ruby (~> 1.0, >= 1.0.5)
+  faraday
   grpc (~> 1.17.1)
   grpc-tools (~> 1.17.1)
   juwelier (~> 2.4.9)

data/VERSION

@@ -1 +1 @@
-0.1.0.alpha.1
+0.1.0

data/lib/prefab/config_client.rb

@@ -8,7 +8,7 @@ module Prefab
       @timeout = timeout
       @initialization_lock = Concurrent::ReadWriteLock.new
 
-      @checkpoint_freq_secs = (ENV["PREFAB_CHECKPOINT_FREQ_SEC"] || DEFAULT_CHECKPOINT_FREQ_SEC)
+      @checkpoint_freq_secs = DEFAULT_CHECKPOINT_FREQ_SEC
 
       @config_loader = Prefab::ConfigLoader.new(@base_client)
       @config_resolver = Prefab::ConfigResolver.new(@base_client, @config_loader)
@@ -70,24 +70,53 @@ module Prefab
     # Bootstrap out of the cache
     # returns the high-watermark of what was in the cache
     def load_checkpoint
-      obj = @s3.bucket('prefab-cloud-checkpoints-prod').object(@base_client.api_key.gsub("|", "/"))
-      obj.get do |f|
-        deltas = Prefab::ConfigDeltas.decode(f)
-        deltas.deltas.each do |delta|
-          @config_loader.set(delta)
-        end
-        @base_client.log_internal Logger::INFO, "Found checkpoint with highwater id #{@config_loader.highwater_mark}"
-        @base_client.stats.increment("prefab.config.checkpoint.load")
-        @config_resolver.update
-        finish_init!
+
+      success = load_checkpoint_from_config
+
+      if !success
+        @base_client.log_internal Logger::INFO, "Fallback to S3"
+        load_checkpoint_from_s3
       end
 
-    rescue Aws::S3::Errors::NoSuchKey
-      @base_client.log_internal Logger::INFO, "No checkpoint"
     rescue => e
       @base_client.log_internal Logger::WARN, "Unexpected problem loading checkpoint #{e}"
     end
 
+    def load_checkpoint_from_config
+      config_req = Prefab::ConfigServicePointer.new(account_id: @base_client.account_id,
+                                                    start_at_id: @config_loader.highwater_mark)
+      resp = stub.get_all_config(config_req)
+      load_deltas(resp, :api)
+      resp.deltas.each do |delta|
+        @config_loader.set(delta)
+      end
+      @config_resolver.update
+      finish_init!(:api)
+      true
+    rescue => e
+      @base_client.log_internal Logger::WARN, "Unexpected problem loading checkpoint #{e}"
+      false
+    end
+
+    def load_checkpoint_from_s3
+      resp = @s3.bucket('prefab-cloud-checkpoints-prod').object(@base_client.api_key.gsub("|", "/")).get
+      deltas = Prefab::ConfigDeltas.decode(resp.body.read)
+      load_deltas(deltas, :s3)
+    rescue Aws::S3::Errors::NoSuchKey
+      @base_client.log_internal Logger::INFO, "No S3 checkpoint. Plan may not support this."
+    end
+
+
+    def load_deltas(deltas, source)
+      deltas.deltas.each do |delta|
+        @config_loader.set(delta)
+      end
+      @base_client.log_internal Logger::INFO, "Found checkpoint with highwater id #{@config_loader.highwater_mark} from #{source}"
+      @base_client.stats.increment("prefab.config.checkpoint.load")
+      @config_resolver.update
+      finish_init!(source)
+    end
+
     # A thread that checks for a checkpoint
     def start_checkpointing_thread
       Thread.new do
@@ -107,8 +136,9 @@ module Prefab
       end
     end
 
-    def finish_init!
+    def finish_init!(source)
       if @initialization_lock.write_locked?
+        @base_client.log_internal Logger::DEBUG, "Unlocked Config via #{source}"
         @initialization_lock.release_write_lock
         @base_client.log.set_config_client(self)
       end
@@ -130,7 +160,7 @@ module Prefab
                 @config_loader.set(delta)
               end
               @config_resolver.update
-              finish_init!
+              finish_init!(:streaming)
             end
           rescue => e
             @base_client.log_internal Logger::INFO, ("config client encountered #{e.message} pausing #{RECONNECT_WAIT}")

data/lib/prefab_services_pb.rb

@@ -29,6 +29,7 @@ module Prefab
       self.service_name = 'prefab.ConfigService'
 
       rpc :GetConfig, ConfigServicePointer, stream(ConfigDeltas)
+      rpc :GetAllConfig, ConfigServicePointer, ConfigDeltas
       rpc :Upsert, UpsertRequest, ConfigServicePointer
     end
 

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.1.0.alpha.1 ruby lib
+# stub: prefab-cloud-ruby 0.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "0.1.0.alpha.1"
+  s.version = "0.1.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
+  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 = "2019-01-18"
+  s.date = "2019-01-20"
   s.description = "RateLimits & Config as a service".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefab-cloud-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc
@@ -194,9 +194,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14