zk 1.6.2 → 1.6.3
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 +2 -2
- data/RELEASES.markdown +4 -0
- data/lib/zk/client/threaded.rb +4 -1
- data/lib/zk/locker/locker_base.rb +2 -0
- data/lib/zk/version.rb +1 -1
- metadata +4 -4
data/Gemfile
CHANGED
@@ -8,8 +8,8 @@ source :rubygems
|
|
8
8
|
# keep closer track of this stuff to make bisecting easier and travis more
|
9
9
|
# accurate
|
10
10
|
|
11
|
-
# git 'git://github.com/slyphon/zookeeper.git', :tag => 'dev/zk/
|
12
|
-
# gem 'zookeeper', '~> 1.
|
11
|
+
# git 'git://github.com/slyphon/zookeeper.git', :tag => 'dev/zk/00008' do
|
12
|
+
# gem 'zookeeper', '~> 1.2.0'
|
13
13
|
# end
|
14
14
|
|
15
15
|
gem 'rake', :group => [:development, :test]
|
data/RELEASES.markdown
CHANGED
data/lib/zk/client/threaded.rb
CHANGED
@@ -156,7 +156,7 @@ module ZK
|
|
156
156
|
tp_size = opts.fetch(:threadpool_size, DEFAULT_THREADPOOL_SIZE)
|
157
157
|
@threadpool = Threadpool.new(tp_size)
|
158
158
|
|
159
|
-
@connection_timeout = opts
|
159
|
+
@connection_timeout = opts[:timeout] || DEFAULT_TIMEOUT # maybe move this into superclass?
|
160
160
|
@event_handler = EventHandler.new(self, opts)
|
161
161
|
|
162
162
|
@reconnect = opts.fetch(:reconnect, true)
|
@@ -244,6 +244,9 @@ module ZK
|
|
244
244
|
|
245
245
|
logger.debug { "reopening, no fork detected" }
|
246
246
|
@last_cnx_state = Zookeeper::ZOO_CONNECTING_STATE
|
247
|
+
|
248
|
+
timeout ||= @connection_timeout # or @connection_timeout here is the docuemnted behavior on Base#reopen
|
249
|
+
|
247
250
|
@cnx.reopen(timeout) # ok, we werent' forked, so just reopen
|
248
251
|
|
249
252
|
# this is a bit of a hack, because we need to wait until the event thread
|
data/lib/zk/version.rb
CHANGED
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: 9
|
5
5
|
prerelease:
|
6
6
|
segments:
|
7
7
|
- 1
|
8
8
|
- 6
|
9
|
-
-
|
10
|
-
version: 1.6.
|
9
|
+
- 3
|
10
|
+
version: 1.6.3
|
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-06-
|
19
|
+
date: 2012-06-06 00:00:00 Z
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|
22
22
|
name: zookeeper
|