synapse 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: a4fc7fdaab530154bb53815482fdac2ea5d316b2
-  data.tar.gz: 8c4d21c1492b5db666dab217b2e5170faa0638f4
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWU1NjVhM2M0NDBhNmU1Mjg0NzllYzUwNGRmNThjODAxMGQyODFmMw==
+  data.tar.gz: !binary |-
+    MTVjZWRhYjM0YjJkNWVhY2Q2ZTY2NWU4NjBmZGI0YmNhZWNjNjI1OQ==
 SHA512:
-  metadata.gz: 448734796df25671d0db0c8f693f2e4820c9ae590c85859790137968d5f63870a5489e7cfc765beb02641e3999a284f54676f336d20467058da586d0d1c51d91
-  data.tar.gz: 991a90e100616daf2c5c7d941c642abea588a565266b126bbff01cb74dbd02e66e0e17907ab3ccdea8a044a3ac3ead937055b604446395ff8b6fbc6a9f840625
+  metadata.gz: !binary |-
+    YTkzMTAwNTBhNTE0NmUwMjg5YjQ4ZTNmNTA5ZTAxZDVlMzhlN2U0YmM5NmVi
+    M2QwMjliOGVjOGVhYzBkYjMwYzliM2Y0Y2Q4ZDJjMDM4ODRmOTJiYjA5OWRl
+    ODc0N2ZmNzg2ZWE4OWMxNTQ3M2M3ZGJlMTY5MmZkYmViN2ZiZWQ=
+  data.tar.gz: !binary |-
+    ZGIxNDA5ZDJjZWU2MjY0YjU4NmI2ODE0YjlkNmFlNmM4OTM4OTQyMWNhZDJl
+    ZDM5NGRmOWVmYTljMmE0YmU3MTc0NDE5NTZiMWFjYTI1ZjM2Y2NkYjJmZDFi
+    YmM0Njc1NDQ1ZmNkMzkwMDZkMWRlM2IzNzczZGZhODI2MDJkNjU=

data/.travis.yml

@@ -7,3 +7,6 @@ rvm:
   - 2.1.10
   - 2.2.5
   - 2.3.1
+
+before_install:
+  - gem install bundler

data/lib/synapse/config_generator/haproxy.rb

@@ -1068,7 +1068,7 @@ class Synapse::ConfigGenerator
 
       # The ordering here is important.  First we add all the backends in the
       # disabled state...
-      @state_cache.backends(watcher).each do |backend_name, backend|
+      @state_cache.backends(watcher.name).each do |backend_name, backend|
         backends[backend_name] = backend.merge('enabled' => false)
         # We remember the haproxy_server_id from a previous reload here.
         # Note though that if live servers below define haproxy_server_id

data/lib/synapse/version.rb

@@ -1,3 +1,3 @@
 module Synapse
-  VERSION = "0.15.0"
+  VERSION = "0.15.1"
 end

data/spec/lib/synapse/haproxy_spec.rb

@@ -481,6 +481,48 @@ describe Synapse::ConfigGenerator::Haproxy do
     expect(subject.generate_backend_stanza(mockwatcher, mockConfig)).to eql(["\nbackend example_service", [], ["\tserver somehost:5555 somehost:5555 id 1 cookie somehost:5555 check inter 2000 rise 3 fall 2"]])
   end
 
+  describe 'when known backend gets offline' do
+    let(:mockStateCache) do
+      mockCache = double(Synapse::ConfigGenerator::Haproxy::HaproxyState)
+      allow(mockCache).to receive(:backends).with(mockwatcher.name).and_return(
+        {
+          "somehost2:5555" => {
+            "host" => "somehost2",
+            "port" => 5555,
+            'haproxy_server_id' => 10,
+          }
+        }
+      )
+      mockCache
+    end
+
+    before do
+      allow(mockwatcher).to receive(:config_for_generator).and_return(
+        {
+          'haproxy' => {
+            'server_options' => "check inter 2000 rise 3 fall 2",
+            'backend_order' => 'no_shuffle',
+          }
+        }
+      )
+      subject.instance_variable_set(:@state_cache, mockStateCache)
+    end
+
+    it 'generates backend stanza with the disabled stat' do
+      mockConfig = ['mode tcp']
+      expect(subject.generate_backend_stanza(mockwatcher, mockConfig)).to eql(
+        [
+          "\nbackend example_service",
+          ["\tmode tcp"],
+          [
+            "\tserver somehost2:5555 somehost2:5555 id 10 check inter 2000 rise 3 fall 2 disabled",
+            "\tserver somehost:5555 somehost:5555 id 1 check inter 2000 rise 3 fall 2"
+          ]
+        ]
+      )
+    end
+  end
+
   describe 'generate backend stanza in correct order' do
     let(:multiple_backends_stanza_map) do
       {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synapse
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Martin Rhoads
@@ -10,174 +10,174 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.39'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.39'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: zk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     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: hashdiff
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Synapse is a daemon used to dynamically configure and manage local instances
@@ -193,10 +193,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".mailmap"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .mailmap
+- .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -249,17 +249,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Dynamic HAProxy configuration daemon