zk 1.6.0 → 1.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/Gemfile +1 -1
- data/RELEASES.markdown +4 -0
- data/lib/zk/client/base.rb +2 -1
- data/lib/zk/version.rb +1 -1
- data/spec/support/logging.rb +3 -2
- metadata +4 -4
data/Gemfile
CHANGED
|
@@ -32,9 +32,9 @@ group :development do
|
|
|
32
32
|
gem 'guard-rspec', :require => false
|
|
33
33
|
gem 'guard-shell', :require => false
|
|
34
34
|
gem 'guard-bundler', :require => false
|
|
35
|
-
gem 'growl', :require => false
|
|
36
35
|
|
|
37
36
|
if RUBY_PLATFORM =~ /darwin/i
|
|
37
|
+
gem 'growl', :require => false
|
|
38
38
|
gem 'rb-readline', :platform => :ruby
|
|
39
39
|
end
|
|
40
40
|
end
|
data/RELEASES.markdown
CHANGED
data/lib/zk/client/base.rb
CHANGED
|
@@ -620,7 +620,8 @@ module ZK
|
|
|
620
620
|
h = { :path => path }.merge(opts)
|
|
621
621
|
|
|
622
622
|
setup_watcher!(:data, h) do
|
|
623
|
-
call_and_check_rc(:stat, h.merge(:ignore => :no_node))
|
|
623
|
+
rv = call_and_check_rc(:stat, h.merge(:ignore => :no_node))
|
|
624
|
+
opts[:callback] ? rv : rv.fetch(:stat)
|
|
624
625
|
end
|
|
625
626
|
end
|
|
626
627
|
|
data/lib/zk/version.rb
CHANGED
data/spec/support/logging.rb
CHANGED
|
@@ -58,10 +58,11 @@ module SpecGlobalLogger
|
|
|
58
58
|
def mute_logger
|
|
59
59
|
zk_log = Logging.logger['ZK']
|
|
60
60
|
orig_level, zk_log.level = zk_log.level, :off
|
|
61
|
-
|
|
61
|
+
orig_zoo_level, Zookeeper.debug_level = Zookeeper.debug_level, Zookeeper::Constants::ZOO_LOG_LEVEL_ERROR
|
|
62
62
|
yield
|
|
63
63
|
ensure
|
|
64
|
-
zk_log.level =
|
|
64
|
+
zk_log.level = orig_level
|
|
65
|
+
Zookeeper.debug_level = orig_zoo_level
|
|
65
66
|
end
|
|
66
67
|
end
|
|
67
68
|
|
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: zk
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
4
|
+
hash: 13
|
|
5
5
|
prerelease:
|
|
6
6
|
segments:
|
|
7
7
|
- 1
|
|
8
8
|
- 6
|
|
9
|
-
-
|
|
10
|
-
version: 1.6.
|
|
9
|
+
- 1
|
|
10
|
+
version: 1.6.1
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- Jonathan D. Simms
|
|
@@ -16,7 +16,7 @@ autorequire:
|
|
|
16
16
|
bindir: bin
|
|
17
17
|
cert_chain: []
|
|
18
18
|
|
|
19
|
-
date: 2012-05-
|
|
19
|
+
date: 2012-05-31 00:00:00 Z
|
|
20
20
|
dependencies:
|
|
21
21
|
- !ruby/object:Gem::Dependency
|
|
22
22
|
name: zookeeper
|