em-redis-unified 0.5.0 → 0.6.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b116757b34c21ab327138250f4de1f1d91e60702
4
- data.tar.gz: 4b3190dca78d94bb965cb8651319bd44a667bbf0
3
+ metadata.gz: f1ea48665c31050fa49d2da3d09a4bdbedbbd4f3
4
+ data.tar.gz: 7d25caee80d846063cc0c15cd1178c62fff1cdd9
5
5
  SHA512:
6
- metadata.gz: 72db6a223383f1a870b0289184132fa6ce12a1cf4759f50bfc3493b5bf00e26e2e69f14406c63bdc6f97960ac240d5f8f94cea12c68cf452f95767f722a55471
7
- data.tar.gz: 5901aaedf92f0cf1bdf8851903347d19335ef845122e58efc3ad9480011e27494cf32ff0d199c6a1e3e15b4e83250ee00a775247dad464df648b0a25126add74
6
+ metadata.gz: ba8dddac2c415bfb793002d1506e3f47c32b4117114d872f7466d4205c043d1c715ec81123d65c0552de4806eafa370a51afd9a7ff5cde1d6a2c29c9dd6adc0d
7
+ data.tar.gz: ab139e9d3be94a9f9272a85b0e9c1c69087013f831a0d262a8495fee050be6055f283df30cb6bcc9eca0dd0f1ff833276f25a4d5da5af69d4f89ba5ed3cc931f
data/lib/em-redis.rb CHANGED
@@ -2,7 +2,7 @@
2
2
  module EMRedis
3
3
 
4
4
  # :stopdoc:
5
- VERSION = '0.5.0'
5
+ VERSION = '0.6.0'
6
6
  LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
7
7
  PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
8
8
  # :startdoc:
@@ -337,12 +337,13 @@ module EventMachine
337
337
  end
338
338
 
339
339
  def initialize(options = {})
340
- @host = options[:host]
341
- @port = options[:port]
342
- @db = (options[:db] || 0).to_i
343
- @password = options[:password]
344
- @auto_reconnect = options[:auto_reconnect] || true
345
- @logger = options[:logger]
340
+ @host = options[:host]
341
+ @port = options[:port]
342
+ @db = (options[:db] || 0).to_i
343
+ @password = options[:password]
344
+ @auto_reconnect = options.fetch(:auto_reconnect, true)
345
+ @reconnect_on_error = options.fetch(:reconnect_on_error, false)
346
+ @logger = options[:logger]
346
347
  @error_callback = lambda do |err|
347
348
  raise err
348
349
  end
@@ -486,8 +487,8 @@ module EventMachine
486
487
  @logger.debug { "Disconnected" } if @logger
487
488
  if @closing
488
489
  @reconnecting = false
489
- elsif (@connected || @reconnecting) && @auto_reconnect
490
- @reconnect_callbacks[:before].call if @connected
490
+ elsif ((@connected || @reconnecting) && @auto_reconnect) || @reconnect_on_error
491
+ @reconnect_callbacks[:before].call unless @reconnecting
491
492
  @reconnecting = true
492
493
  EM.add_timer(1) do
493
494
  @logger.debug { "Reconnecting to #{@host}:#{@port}" } if @logger
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: em-redis-unified
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.0
4
+ version: 0.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonathan Broad
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2014-05-27 00:00:00.000000000 Z
13
+ date: 2015-03-13 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: eventmachine
@@ -32,28 +32,28 @@ dependencies:
32
32
  requirements:
33
33
  - - ">="
34
34
  - !ruby/object:Gem::Version
35
- version: 1.2.0
35
+ version: '0'
36
36
  type: :development
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
40
  - - ">="
41
41
  - !ruby/object:Gem::Version
42
- version: 1.2.0
42
+ version: '0'
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: em-spec
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
47
  - - ">="
48
48
  - !ruby/object:Gem::Version
49
- version: 0.2.6
49
+ version: '0'
50
50
  type: :development
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
53
53
  requirements:
54
54
  - - ">="
55
55
  - !ruby/object:Gem::Version
56
- version: 0.2.6
56
+ version: '0'
57
57
  - !ruby/object:Gem::Dependency
58
58
  name: bones
59
59
  requirement: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
107
107
  version: '0'
108
108
  requirements: []
109
109
  rubyforge_project: em-redis-unified
110
- rubygems_version: 2.2.0
110
+ rubygems_version: 2.2.2
111
111
  signing_key:
112
112
  specification_version: 4
113
113
  summary: An eventmachine-based implementation of the Redis protocol