zk_recipes 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37a0d167b23c76d73ecfb6255f77c636b31d5c48
-  data.tar.gz: bd1e2e0f61651b90223f10eb792adcd8af83c801
+  metadata.gz: 8fa28d0852ec9e71d6f8a38daaf6c77626e11b7d
+  data.tar.gz: c2222216513454ecf137f88c266345327085551f
 SHA512:
-  metadata.gz: 6d5a3ac3aa698cd69a166ed8690c2bae9648873ae76b8ea85142c15a2628ac56850f2a0c2c0f42d6dbd61b7282705cddd3e5151b4fada7136148a28866e843fe
-  data.tar.gz: 3b17097bff56c25f5419171731e52245597ec79af4f6c694d531a7ab302dcecd452d49d86e426b7f4613e0bed332f4066ed11fc5ed49c2d6451b4e4154ba3d87
+  metadata.gz: 90599a5eb832a705ce159dcc88c1d1ca8bed88b9b282e3996b049d65a50acd3d0f6f77463a956899b19ac6deca389ab07a790c7ecf0e79b0d0adeda89a724b83
+  data.tar.gz: 247ca67c9cee03ab06da4e117908947ab7fc85dc598a930341b3d877534653b3a16c6bf901a266a73e32bdc3339fec42b7d3f40ce0a024155e4e4cf4e8898e3b

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.2.2
+
+- More logging tweaks: use block form of logging for everything *execpt* string literals
+- Add `ZkRecipes::Cache::USE_DEFAULT` marker so deserializers can return a default value without raising
+
 ## 0.2.1
 
 - Tweak logging

data/lib/zk_recipes/cache.rb

@@ -55,13 +55,13 @@ module ZkRecipes
       @registered_values.each do |path, _value|
         @watches[path] = @zk.register(path) do |event|
           if event.node_event?
-            debug("node event path=#{event.path} #{event.event_name} #{event.state_name}")
+            debug { "node event path=#{event.path} #{event.event_name} #{event.state_name}" }
             unless update_cache(event.path)
               @pending_updates[path] = nil
               @zk.defer { process_pending_updates }
             end
           else
-            warn("session event #{event.event_name} #{event.state_name}")
+            warn { "session event #{event.event_name} #{event.state_name}" }
           end
         end
       end
@@ -82,16 +82,16 @@ module ZkRecipes
       end
 
       @zk.on_exception do |e|
-        error("on_exception exception=#{e.inspect} backtrace=#{e.backtrace.inspect}")
+        error { "on_exception exception=#{e.inspect} backtrace=#{e.backtrace.inspect}" }
       end
     end
 
     def wait_for_warm_cache(timeout = 30)
-      debug("waiting for cache to warm timeout=#{timeout.inspect}")
+      debug { "waiting for cache to warm timeout=#{timeout.inspect}" }
       if @latch.wait(timeout)
         true
       else
-        warn("didn't warm cache before timeout connected=#{@zk.connected?} timeout=#{timeout.inspect}")
+        warn { "didn't warm cache before timeout connected=#{@zk.connected?} timeout=#{timeout.inspect}" }
         false
       end
     end
@@ -135,7 +135,7 @@ module ZkRecipes
     def connect(host, zk_opts)
       raise Error, "already connected" if @zk
 
-      debug("connecting host=#{host.inspect}")
+      debug { "connecting host=#{host.inspect}" }
       ZK.new(host, **zk_opts) do |zk|
         setup_callbacks(zk)
       end
@@ -150,7 +150,7 @@ module ZkRecipes
       unless stat.exists?
         value = @registered_values.fetch(path).default_value
         @cache[path] = CachedPath.new(value, stat: stat)
-        debug("no node, setting watch path=#{path}")
+        debug { "no node, setting watch path=#{path}" }
         instrument_params[:value] = value
         ActiveSupport::Notifications.instrument(AS_NOTIFICATION, instrument_params)
         return true
@@ -167,29 +167,34 @@ module ZkRecipes
         registered_value = @registered_values.fetch(path)
         instrument_params[:value] = registered_value.deserialize(raw_value)
       rescue => e
-        error("deserialization error path=#{path} stat=#{stat.inspect} exception=#{e.inspect} #{e.backtrace.inspect}")
+        error { "deserialization error path=#{path} stat=#{stat.inspect} exception=#{e.inspect} #{e.backtrace.inspect}" }
         instrument_params[:error] = e
         instrument_params[:raw_value] = raw_value
         valid = false
         registered_value.default_value
       end
 
+      if value == USE_DEFAULT
+        valid = false
+        value = registered_value.default_value
+      end
+
       @cache[path] = CachedPath.new(value, stat: stat, valid: valid)
 
       ActiveSupport::Notifications.instrument(AS_NOTIFICATION, instrument_params)
       debug { "update_cache path=#{path} raw_value=#{raw_value.inspect} value=#{value.inspect} stat=#{stat.inspect}" }
       true
     rescue ::ZK::Exceptions::ZKError => e
-      warn("update_cache path=#{path} exception=#{e.inspect}, retrying")
+      warn { "update_cache path=#{path} exception=#{e.inspect}, retrying" }
       retry
     rescue ::ZK::Exceptions::KeeperException, ::Zookeeper::Exceptions::ZookeeperException => e
-      error("update_cache path=#{path} exception=#{e.inspect}")
+      error { "update_cache path=#{path} exception=#{e.inspect}" }
       false
     end
 
     def process_pending_updates
       return if @pending_updates.empty?
-      debug("processing pending updates=#{@pending_updates.size}")
+      debug { "processing pending updates=#{@pending_updates.size}" }
       @pending_updates.reject! do |missed_path, _|
         update_cache(missed_path)
       end
@@ -204,6 +209,8 @@ module ZkRecipes
       EOM
     end
 
+    USE_DEFAULT = Object.new
+
     class CachedPath
       attr_reader :value, :stat
       def initialize(value, stat: nil, valid: false)

data/lib/zk_recipes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZkRecipes
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zk_recipes
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Andrew Lazarus
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Common Recipes for Zookeeper