synapse 0.14.5 → 0.14.6

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: 591cea7bfd006aec1c360b1608922c2f8bb4cfb7
4
- data.tar.gz: 3fc33d1a16e730badca18998865c308c425a8925
3
+ metadata.gz: 47da3a9b2e73468399e48e301d1636560b8b8990
4
+ data.tar.gz: 3c7b64cddd8b580197422db3afe70da4c0700e9b
5
5
  SHA512:
6
- metadata.gz: 12ae9ce7e0b50e89f4238f2014c93e15d3aab24f2485f2ef11d463905c4a781ca908189c76566a69768f8f52536f3cd829e95f9a2687ee9261d001f933e895f4
7
- data.tar.gz: 7ce91f1ba73195adeb8e17a251f0e04809718035f8bf2d1b7697d3779971fa8f6241a20dde29cdffea7c1957f4e96c161b9c384317bfe24188c4347cd3fc790f
6
+ metadata.gz: f512abc172b6adce0b33dcef4b8126c7e963c0c1239dc0095f1be94be75d6ce923994d172609ee0a83a6d44d748fcf7477bb8c746564876b298aabb10e8d65fc
7
+ data.tar.gz: 110186d6f417b3cfec51712a895152eccc2032cc61b15dbc59dfaf3814aeeb42b34f0307c64a03c032e2e9a7db45137167c59efd6fbf008fe11fa7748f1391d7
@@ -107,10 +107,11 @@ class Synapse::ServiceWatcher
107
107
  end
108
108
 
109
109
  class Zookeeper < Synapse::ServiceWatcher::ZookeeperWatcher
110
- def initialize(opts={}, synapse, message_queue)
110
+ def initialize(opts={}, parent=nil, synapse, message_queue)
111
111
  super(opts, synapse)
112
112
 
113
113
  @message_queue = message_queue
114
+ @parent = parent
114
115
  end
115
116
 
116
117
  # Overrides reconfigure! to cause the new list of servers to be messaged
@@ -118,6 +119,10 @@ class Synapse::ServiceWatcher
118
119
  def reconfigure!
119
120
  # push the new backends onto the queue
120
121
  @message_queue.push(Messages::NewServers.new(@backends))
122
+ # Propagate revision updates down to ZookeeperDnsWatcher, so
123
+ # that stanza cache can work properly.
124
+ @revision += 1
125
+ @parent.reconfigure! unless @parent.nil?
121
126
  end
122
127
 
123
128
  private
@@ -148,6 +153,7 @@ class Synapse::ServiceWatcher
148
153
 
149
154
  @zk = Zookeeper.new(
150
155
  mk_child_watcher_opts(zookeeper_discovery_opts),
156
+ self,
151
157
  @synapse,
152
158
  @message_queue
153
159
  )
@@ -186,6 +192,12 @@ class Synapse::ServiceWatcher
186
192
  @dns.backends
187
193
  end
188
194
 
195
+ # Override reconfigure! as this class should not explicitly reconfigure
196
+ # synapse
197
+ def reconfigure!
198
+ @revision += 1
199
+ end
200
+
189
201
  private
190
202
 
191
203
  def validate_discovery_opts
@@ -222,10 +234,5 @@ class Synapse::ServiceWatcher
222
234
  'default_servers' => @default_servers,
223
235
  }
224
236
  end
225
-
226
- # Override reconfigure! as this class should not explicitly reconfigure
227
- # synapse
228
- def reconfigure!
229
- end
230
237
  end
231
238
  end
@@ -1,3 +1,3 @@
1
1
  module Synapse
2
- VERSION = "0.14.5"
2
+ VERSION = "0.14.6"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: synapse
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.14.5
4
+ version: 0.14.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Martin Rhoads
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2017-04-14 00:00:00.000000000 Z
13
+ date: 2017-06-21 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: aws-sdk