synapse 0.12.2 → 0.13.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 34b7877f7f8196407e10fafab1a72354e861121c
+  data.tar.gz: 154d642f85c7a1d1ab13078a8adb1a75d295d993
+SHA512:
+  metadata.gz: 06e858b8cd8a0c316baad80264754206ee64615f7ca0f7958ebf7d38a5b07d67968d949d09367dd127b525e1f6710611d48813af224fe3371bd1e2c78c4da343
+  data.tar.gz: 41be259d76cd50f950b4d6e2e217f4c68134a8f71cfcc75bf69842f7d5edee95bac61996412ba8b9a00057ceb52e651aa4837e2146c3c57432929fbbbfb1f641

data/README.md

@@ -97,6 +97,11 @@ install synapse with:
 
 ```bash
 $ mkdir -p /opt/smartstack/synapse
+
+# If you want to install specific versions of dependencies such as an older
+# version of the aws-sdk, the docker-api, etc, gem install that here *before*
+# gem installing synapse
+
 # If you are on Ruby 2.X use --no-document instead of --no-ri --no-rdoc
 $ gem install synapse --install-dir /opt/smartstack/synapse --no-ri --no-rdoc
 ```
@@ -141,25 +146,39 @@ Each value in the services hash is also a hash, and should contain the following
 We've included a number of `watchers` which provide service discovery.
 Put these into the `discovery` section of the service hash, with these options:
 
-##### Stub #####
+##### Base #####
 
-The stub watcher is useful in situations where you only want to use the servers in the `default_servers` list.
+The base watcher is useful in situations where you only want to use the servers in the `default_servers` list.
 It has only one option:
 
-* `method`: stub
+* `method`: base
 
 ##### Zookeeper #####
 
 This watcher retrieves a list of servers from zookeeper.
-It takes the following options:
+It takes the following mandatory arguments:
 
 * `method`: zookeeper
 * `path`: the zookeeper path where ephemeral nodes will be created for each available service server
 * `hosts`: the list of zookeeper servers to query
 
 The watcher assumes that each node under `path` represents a service server.
-Synapse attempts to decode the data in each of these nodes using JSON and also using Thrift under the standard Twitter service encoding.
-We assume that the data contains a hostname and a port for service servers.
+
+The following arguments are optional:
+
+* `decode`: A hash containing configuration for how to decode the data found in zookeeper.
+
+###### Decoding service nodes ######
+Synapse attempts to decode the data in each of these nodes using JSON and you can control how it is decoded with the `decode` argument. If provided, the `decode` hash should contain the following:
+
+* `method` (one of ['`nerve`', '`serverset`'], default: '`nerve`'): The kind of data to expect to find in zookeeper nodes
+* `endpoint_name` (default: nil): If using the `serverset` method, this controls which of the `additionalEndpoints` is chosen instead of the `serviceEndpoint` data. If not supplied the `serverset` method will use the host/port from the `serviceEndpoint` data.
+
+If the `method` is `nerve`, then we expect to find nerve registrations with a `host` and a `port`.
+
+If the `method` is `serverset` then we expect to find Finagle ServerSet
+(also used by [Aurora](https://github.com/apache/aurora/blob/master/docs/user-guide.md#service-discovery)) registrations with a `serviceEndpoint` and optionally one or more `additionalEndpoints`.
+The Synapse `name` will be automatically deduced from `shard` if present.
 
 ##### Docker #####
 
@@ -232,6 +251,7 @@ by unsetting `use_previous_backends`.
 This section is its own hash, which should contain the following keys:
 
 * `port`: the port (on localhost) where HAProxy will listen for connections to the service. If this is omitted, only a backend stanza (and no frontend stanza) will be generated for this service; you'll need to get traffic to your service yourself via the `shared_frontend` or manual frontends in `extra_sections`
+* `bind_address`: force HAProxy to listen on this address ( default is localhost ). Setting `bind_address` on a per service basis overrides the global `bind_address` in the top level `haproxy`. Having HAProxy listen for connections on different addresses ( example: service1 listen on 127.0.0.2:443 and service2 listen on 127.0.0.3:443) allows /etc/hosts entries to point to services.
 * `server_port_override`: the port that discovered servers listen on; you should specify this if your discovery mechanism only discovers names or addresses (like the DNS watcher). If the discovery method discovers a port along with hostnames (like the zookeeper watcher) this option may be left out, but will be used in preference if given.
 * `server_options`: the haproxy options for each `server` line of the service in HAProxy config; it may be left out.
 * `frontend`: additional lines passed to the HAProxy config in the `frontend` stanza of this service
@@ -239,6 +259,7 @@ This section is its own hash, which should contain the following keys:
 * `backend_name`: The name of the generated HAProxy backend for this service
   (defaults to the service's key in the `services` section)
 * `listen`: these lines will be parsed and placed in the correct `frontend`/`backend` section as applicable; you can put lines which are the same for the frontend and backend here.
+* `backend_order`: optional: how backends should be ordered in the `backend` stanza. (default is shuffling). Setting to `asc` means sorting backends in ascending alphabetical order before generating stanza. `desc` means descending alphabetical order. `no_shuffle` means no shuffling or sorting.
 * `shared_frontend`: optional: haproxy configuration directives for a shared http frontend (see below)
 
 <a name="haproxy"/>
@@ -259,11 +280,16 @@ The top level `haproxy` section of the config file has the following options:
 * `restart_interval`: number of seconds to wait between restarts of haproxy (default: 2)
 * `restart_jitter`: percentage, expressed as a float, of jitter to multiply the `restart_interval` by when determining the next
   restart time. Use this to help prevent healthcheck storms when HAProxy restarts. (default: 0.0)
-* `state_file_path`: full path on disk (e.g. /tmp/synapse/state.json) for caching haproxy state between reloads.
-  If provided, synapse will store recently seen backends at this location and can "remember" backends across both synapse and
-  HAProxy restarts. Any backends that are "down" in the reporter but listed in the cache will be put into HAProxy disabled (default: nil)
-* `state_file_ttl`: the number of seconds that backends should be kept in the state file cache.
-  This only applies if `state_file_path` is provided (default: 86400)
+* `state_file_path`: full path on disk (e.g. /tmp/synapse/state.json) for
+  caching haproxy state between reloads.  If provided, synapse will store
+  recently seen backends at this location and can "remember" backends across
+  both synapse and HAProxy restarts. Any backends that are "down" in the
+  reporter but listed in the cache will be put into HAProxy disabled. Synapse
+  writes the state file every sixty seconds, so the file's age can be used to
+  monitor that Synapse is alive and making progress. (default: nil)
+* `state_file_ttl`: the number of seconds that backends should be kept in the
+  state file cache.  This only applies if `state_file_path` is provided.
+  (default: 86400)
 
 Note that a non-default `bind_address` can be dangerous.
 If you configure an `address:port` combination that is already in use on the system, haproxy will fail to start.

data/lib/synapse/haproxy.rb

@@ -686,7 +686,7 @@ module Synapse
       stanza = [
         "\nfrontend #{watcher.name}",
         config.map {|c| "\t#{c}"},
-        "\tbind #{@opts['bind_address'] || 'localhost'}:#{watcher.haproxy['port']}",
+        "\tbind #{ watcher.haproxy['bind_address'] || @opts['bind_address'] || 'localhost'}:#{watcher.haproxy['port']}",
         "\tdefault_backend #{watcher.haproxy.fetch('backend_name', watcher.name)}"
       ]
     end
@@ -721,10 +721,20 @@ module Synapse
         log.debug "synapse: no backends found for watcher #{watcher.name}"
       end
 
+      keys = case watcher.haproxy['backend_order']
+      when 'asc'
+        backends.keys.sort
+      when 'desc'
+        backends.keys.sort.reverse
+      when 'no_shuffle'
+        backends.keys
+      else
+        backends.keys.shuffle
+      end
       stanza = [
         "\nbackend #{watcher.haproxy.fetch('backend_name', watcher.name)}",
         config.map {|c| "\t#{c}"},
-        backends.keys.shuffle.map {|backend_name|
+        keys.map {|backend_name|
           backend = backends[backend_name]
           b = "\tserver #{backend_name} #{backend['host']}:#{backend['port']}"
           b = "#{b} cookie #{backend_name}" unless config.include?('mode tcp')

data/lib/synapse/service_watcher/base.rb

@@ -21,6 +21,7 @@ class Synapse::ServiceWatcher
 
       @name = opts['name']
       @discovery = opts['discovery']
+      @label_filter = @discovery['label_filter'] || false
 
       @leader_election = opts['leader_election'] || false
       @leader_last_warn = Time.now - LEADER_WARN_INTERVAL
@@ -86,6 +87,8 @@ class Synapse::ServiceWatcher
 
         # if leader election fails, return no backends
         return []
+      elsif @label_filter
+        return filter_backends_by_label(@backends, @label_filter)
       end
 
       return @backends
@@ -99,6 +102,17 @@ class Synapse::ServiceWatcher
       log.warn "synapse: warning: a stub watcher with no default servers is pretty useless" if @default_servers.empty?
     end
 
+    def filter_backends_by_label(backends, label_filter)
+      filtered_backends = []
+      backends.each do |backend|
+        backend_labels = backend['labels'] || {}
+        if label_filter['condition'] == 'equals' and backend_labels[label_filter['label']] == label_filter['value']
+          filtered_backends << backend
+        end
+      end
+      return filtered_backends
+    end
+
     def set_backends(new_backends)
       # Aggregate and deduplicate all potential backend service instances.
       new_backends = (new_backends + @default_servers) if @keep_default_servers

data/lib/synapse/service_watcher/zookeeper.rb

@@ -11,6 +11,24 @@ class Synapse::ServiceWatcher
     @@zk_pool_count = {}
     @@zk_pool_lock = Mutex.new
 
+    def initialize(opts={}, synapse)
+      super(opts, synapse)
+
+      # Alternative deserialization support. By default we use nerve
+      # deserialization, but we also support serverset registries
+      @decode_method = self.method(:nerve_decode)
+      if @discovery['decode']
+        valid_methods = ['nerve', 'serverset']
+        decode_method = @discovery['decode']['method']
+        unless decode_method && valid_methods.include?(decode_method)
+          raise ArgumentError, "missing or invalid decode method #{decode_method}"
+        end
+        if decode_method == 'serverset'
+          @decode_method = self.method(:serverset_decode)
+        end
+      end
+    end
+
     def start
       @zk_hosts = @discovery['hosts'].sort.join(',')
 
@@ -43,6 +61,57 @@ class Synapse::ServiceWatcher
         unless @discovery['path']
     end
 
+    # Supported decode methods
+
+    # Airbnb nerve ZK node data looks like this:
+    #
+    # {
+    #   "host": "somehostname",
+    #   "port": 1234,
+    # }
+    def nerve_decode(data)
+      JSON.parse(data)
+    end
+
+    # Twitter serverset ZK node data looks like this:
+    #
+    # {
+    #   "additionalEndpoints": {
+    #     "serverset": {
+    #       "host": "somehostname",
+    #       "port": 31943
+    #     },
+    #     "http": {
+    #       "host": "somehostname",
+    #       "port": 31943
+    #     },
+    #     "otherport": {
+    #       "host": "somehostname",
+    #       "port": 31944
+    #     }
+    #   },
+    #   "serviceEndpoint": {
+    #     "host": "somehostname",
+    #     "port": 31943
+    #   },
+    #   "shard": 0,
+    #   "status": "ALIVE"
+    # }
+    def serverset_decode(data)
+      decoded = JSON.parse(data)
+      if @discovery['decode']['endpoint_name']
+        endpoint_name = @discovery['decode']['endpoint_name']
+        raise KeyError, "json data has no additionalEndpoint called #{endpoint_name}" \
+          unless decoded['additionalEndpoints'] && decoded['additionalEndpoints'][endpoint_name]
+        result = decoded['additionalEndpoints'][endpoint_name]
+      else
+        result = decoded['serviceEndpoint']
+      end
+      result['name'] = decoded['shard'] || nil
+      result['name'] = result['name'].to_s unless result['name'].nil?
+      result
+    end
+
     # helper method that ensures that the discovery path exists
     def create(path)
       log.debug "synapse: creating ZK path: #{path}"
@@ -62,11 +131,11 @@ class Synapse::ServiceWatcher
 
         begin
           # TODO: Do less munging, or refactor out this processing
-          host, port, name, weight, haproxy_server_options = deserialize_service_instance(node.first)
+          host, port, name, weight, haproxy_server_options, labels = deserialize_service_instance(node.first)
         rescue StandardError => e
           log.error "synapse: invalid data in ZK node #{id} at #{@discovery['path']}: #{e}"
         else
-          server_port = @server_port_override ? @server_port_override : port
+          server_port = @haproxy['server_port_override'] ? @haproxy['server_port_override'] : port
 
           # find the numberic id in the node name; used for leader elections if enabled
           numeric_id = id.split('_').last
@@ -76,7 +145,8 @@ class Synapse::ServiceWatcher
           new_backends << {
             'name' => name, 'host' => host, 'port' => server_port,
             'id' => numeric_id, 'weight' => weight,
-            'haproxy_server_options' => haproxy_server_options
+            'haproxy_server_options' => haproxy_server_options,
+            'labels' => labels
           }
         end
       end
@@ -173,15 +243,17 @@ class Synapse::ServiceWatcher
     # decode the data at a zookeeper endpoint
     def deserialize_service_instance(data)
       log.debug "synapse: deserializing process data"
-      decoded = JSON.parse(data)
+      decoded = @decode_method.call(data)
 
-      host = decoded['host'] || (raise ValueError, 'instance json data does not have host key')
-      port = decoded['port'] || (raise ValueError, 'instance json data does not have port key')
+      host = decoded['host'] || (raise KeyError, 'instance json data does not have host key')
+      port = decoded['port'] || (raise KeyError, 'instance json data does not have port key')
       name = decoded['name'] || nil
       weight = decoded['weight'] || nil
       haproxy_server_options = decoded['haproxy_server_options'] || nil
+      labels = decoded['labels'] || nil
 
-      return host, port, name, weight, haproxy_server_options
+      return host, port, name, weight, haproxy_server_options, labels
     end
   end
 end
+

data/lib/synapse/version.rb

@@ -1,3 +1,3 @@
 module Synapse
-  VERSION = "0.12.2"
+  VERSION = "0.13.1"
 end

data/spec/lib/synapse/haproxy_spec.rb

@@ -23,6 +23,21 @@ describe Synapse::Haproxy do
     mockWatcher
   end
 
+  let(:mockwatcher_frontend) do
+    mockWatcher = double(Synapse::ServiceWatcher)
+    allow(mockWatcher).to receive(:name).and_return('example_service')
+    allow(mockWatcher).to receive(:haproxy).and_return('port' => 2200)
+    mockWatcher
+  end
+
+  let(:mockwatcher_frontend_with_bind_address) do
+    mockWatcher = double(Synapse::ServiceWatcher)
+    allow(mockWatcher).to receive(:name).and_return('example_service')
+    allow(mockWatcher).to receive(:haproxy).and_return('port' => 2200, 'bind_address' => "127.0.0.3")
+    mockWatcher
+  end
+
+
   it 'updating the config' do
     expect(subject).to receive(:generate_config)
     subject.update_config([mockwatcher])
@@ -33,6 +48,34 @@ describe Synapse::Haproxy do
     expect(subject.generate_backend_stanza(mockwatcher, mockConfig)).to eql(["\nbackend example_service", [], ["\tserver somehost:5555 somehost:5555 cookie somehost:5555 check inter 2000 rise 3 fall 2"]])
   end
 
+  describe 'generate backend stanza in correct order' do
+    let(:multiple_backends_stanza_map) do
+      {
+        'asc' => ["\nbackend example_service", [], ["\tserver somehost1:5555 somehost1:5555 cookie somehost1:5555 check inter 2000 rise 3 fall 2", "\tserver somehost2:5555 somehost2:5555 cookie somehost2:5555 check inter 2000 rise 3 fall 2", "\tserver somehost3:5555 somehost3:5555 cookie somehost3:5555 check inter 2000 rise 3 fall 2"]],
+        'desc' => ["\nbackend example_service", [], ["\tserver somehost3:5555 somehost3:5555 cookie somehost3:5555 check inter 2000 rise 3 fall 2", "\tserver somehost2:5555 somehost2:5555 cookie somehost2:5555 check inter 2000 rise 3 fall 2", "\tserver somehost1:5555 somehost1:5555 cookie somehost1:5555 check inter 2000 rise 3 fall 2"]],
+        'no_shuffle' => ["\nbackend example_service", [], ["\tserver somehost1:5555 somehost1:5555 cookie somehost1:5555 check inter 2000 rise 3 fall 2", "\tserver somehost3:5555 somehost3:5555 cookie somehost3:5555 check inter 2000 rise 3 fall 2", "\tserver somehost2:5555 somehost2:5555 cookie somehost2:5555 check inter 2000 rise 3 fall 2"]]
+      }
+    end
+
+    let(:mockwatcher_with_multiple_backends) do
+      mockWatcher = double(Synapse::ServiceWatcher)
+      allow(mockWatcher).to receive(:name).and_return('example_service')
+      backends = [{ 'host' => 'somehost1', 'port' => 5555}, {'host' => 'somehost3', 'port' => 5555}, { 'host' => 'somehost2', 'port' => 5555}]
+      allow(mockWatcher).to receive(:backends).and_return(backends)
+      mockWatcher
+    end
+
+    ['asc', 'desc', 'no_shuffle'].each do |order_option|
+      context "when #{order_option} is specified for backend_order" do
+        it 'generates backend stanza in correct order' do
+          mockConfig = []
+          allow(mockwatcher_with_multiple_backends).to receive(:haproxy).and_return({'server_options' => "check inter 2000 rise 3 fall 2", 'backend_order' => order_option})
+          expect(subject.generate_backend_stanza(mockwatcher_with_multiple_backends, mockConfig)).to eql(multiple_backends_stanza_map[order_option])
+        end
+      end
+    end
+  end
+
   it 'generates backend stanza without cookies for tcp mode' do
     mockConfig = ['mode tcp']
     expect(subject.generate_backend_stanza(mockwatcher, mockConfig)).to eql(["\nbackend example_service", ["\tmode tcp"], ["\tserver somehost:5555 somehost:5555 check inter 2000 rise 3 fall 2"]])
@@ -42,4 +85,15 @@ describe Synapse::Haproxy do
     mockConfig = []
     expect(subject.generate_backend_stanza(mockwatcher_with_server_options, mockConfig)).to eql(["\nbackend example_service", [], ["\tserver somehost:5555 somehost:5555 cookie somehost:5555 check inter 2000 rise 3 fall 2 backup"]])
   end
+
+  it 'generates frontend stanza ' do
+    mockConfig = []
+    expect(subject.generate_frontend_stanza(mockwatcher_frontend, mockConfig)).to eql(["\nfrontend example_service", [], "\tbind localhost:2200", "\tdefault_backend example_service"])
+  end
+
+  it 'respects frontend bind_address ' do
+    mockConfig = []
+    expect(subject.generate_frontend_stanza(mockwatcher_frontend_with_bind_address, mockConfig)).to eql(["\nfrontend example_service", [], "\tbind 127.0.0.3:2200", "\tdefault_backend example_service"])
+  end
+
 end

data/spec/lib/synapse/service_watcher_base_spec.rb

@@ -109,5 +109,31 @@ describe Synapse::ServiceWatcher::BaseWatcher do
         expect(subject.backends).to eq(backends + default_servers)
       end
     end
+
+    context 'with label_filter set' do
+      let(:matching_labeled_backends) { [
+        { 'name' => 'server1', 'host' => 'server1', 'port' => 1111, 'labels' => { 'az' => 'us-east-1a' } },
+        { 'name' => 'server2', 'host' => 'server2', 'port' => 2222, 'labels' => { 'az' => 'us-east-1a' } },
+      ] }
+      let(:non_matching_labeled_backends) { [
+        { 'name' => 'server3', 'host' => 'server3', 'port' => 3333, 'labels' => { 'az' => 'us-west-1c' } },
+        { 'name' => 'server4', 'host' => 'server4', 'port' => 4444, 'labels' => { 'az' => 'us-west-2a' } },
+      ] }
+      let(:non_labeled_backends) { [
+        { 'name' => 'server5', 'host' => 'server5', 'port' => 5555 },
+      ] }
+      let(:args) {
+        testargs.merge({ 'discovery' => {
+          'method' => 'base',
+          'label_filter' => { 'condition' => 'equals', 'label' => 'az', 'value' => 'us-east-1a' } }
+        })
+      }
+      it 'removes all backends that do not match the label_filter' do
+        expect(subject).to receive(:'reconfigure!').exactly(:once)
+        subject.send(:set_backends, matching_labeled_backends + non_matching_labeled_backends +
+                     non_labeled_backends)
+        expect(subject.backends).to eq(matching_labeled_backends)
+      end
+    end
   end
 end

data/spec/lib/synapse/service_watcher_zookeeper_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+require 'synapse/service_watcher/zookeeper'
+require 'synapse/service_watcher/zookeeper_dns'
+
+describe Synapse::ServiceWatcher::ZookeeperWatcher do
+  let(:mock_synapse) { double }
+  let(:config) do
+    {
+      'name' => 'test',
+      'haproxy' => {},
+      'discovery' => discovery,
+    }
+  end
+
+  let(:service_data) do
+    {
+      'host' => 'server',
+      'port' => '8888',
+      'name' => 'server',
+      'weight' => '1',
+      'haproxy_server_options' => 'backup',
+      'labels' => { 'az' => 'us-east-1a' }
+    }
+  end
+  let(:service_data_string) { service_data.to_json }
+  let(:deserialized_service_data) {
+    [ service_data['host'], service_data['port'], service_data['name'], service_data['weight'],
+      service_data['haproxy_server_options'], service_data['labels'] ]
+  }
+
+  context 'ZookeeperWatcher' do
+    let(:discovery) { { 'method' => 'zookeeper', 'hosts' => 'somehost','path' => 'some/path' } }
+    subject { Synapse::ServiceWatcher::ZookeeperWatcher.new(config, mock_synapse) }
+    it 'decodes data correctly' do
+      expect(subject.send(:deserialize_service_instance, service_data_string)).to eql(deserialized_service_data)
+    end
+  end
+
+  context 'ZookeeperDnsWatcher' do
+    let(:discovery) { { 'method' => 'zookeeper_dns', 'hosts' => 'somehost','path' => 'some/path' } }
+    let(:message_queue) { [] }
+    subject { Synapse::ServiceWatcher::ZookeeperDnsWatcher::Zookeeper.new(config, mock_synapse, message_queue) }
+    it 'decodes data correctly' do
+      expect(subject.send(:deserialize_service_instance, service_data_string)).to eql(deserialized_service_data)
+    end
+  end
+end

data/synapse.gemspec

@@ -17,8 +17,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
 
   gem.add_runtime_dependency "aws-sdk", "~> 1.39"
-  gem.add_runtime_dependency "docker-api", "~> 1.7.2"
+  gem.add_runtime_dependency "docker-api", "~> 1.7"
   gem.add_runtime_dependency "zk", "~> 1.9.4"
+  gem.add_runtime_dependency "logging", "~> 1.8"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec", "~> 3.1.0"

metadata

@@ -1,145 +1,142 @@
 --- !ruby/object:Gem::Specification
 name: synapse
 version: !ruby/object:Gem::Version
-  version: 0.12.2
-  prerelease: 
+  version: 0.13.1
 platform: ruby
 authors:
 - Martin Rhoads
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.39'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.39'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: zk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.4
+- !ruby/object:Gem::Dependency
+  name: logging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ': Write a gem description'
+description: ": Write a gem description"
 email:
 - martin.rhoads@airbnb.com
 executables:
@@ -147,10 +144,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .mailmap
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".mailmap"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -185,34 +182,34 @@ files:
 - spec/lib/synapse/service_watcher_ec2tags_spec.rb
 - spec/lib/synapse/service_watcher_marathon_spec.rb
 - spec/lib/synapse/service_watcher_spec.rb
+- spec/lib/synapse/service_watcher_zookeeper_spec.rb
 - spec/spec_helper.rb
 - spec/support/configuration.rb
 - spec/support/minimum.conf.yaml
 - synapse.gemspec
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
-summary: ': Write a gem summary'
+specification_version: 4
+summary: ": Write a gem summary"
 test_files:
 - spec/lib/synapse/file_output_spec.rb
 - spec/lib/synapse/haproxy_spec.rb
@@ -221,6 +218,7 @@ test_files:
 - spec/lib/synapse/service_watcher_ec2tags_spec.rb
 - spec/lib/synapse/service_watcher_marathon_spec.rb
 - spec/lib/synapse/service_watcher_spec.rb
+- spec/lib/synapse/service_watcher_zookeeper_spec.rb
 - spec/spec_helper.rb
 - spec/support/configuration.rb
 - spec/support/minimum.conf.yaml