synapse 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f4b4d3c79352195ba849dcbe72ae849a65f355b
-  data.tar.gz: 9270bec56704c96e37fc37862ee3bb3d4b2501a2
+  metadata.gz: 57e70e79531b09abe194f6aa92dfb616347cb241
+  data.tar.gz: 60192ea4643d87890dbf808125d624454a3214f6
 SHA512:
-  metadata.gz: 7df9f4fec05f203f66d1b5113df94e35e08d3f3ce5864ae1ba543829640a752d1938e4f9b04530782f7897427b0bbd6e6e07bc88f1ec6f7b003783ba154ed565
-  data.tar.gz: 2bde1c280db160799a9f52cfdedfdf28ce9060d78462a90538849984a9cffd60dad45d304562553bcc44453d440c81ada8c711e7edab97e9493bcf3594e87851
+  metadata.gz: 4d98b6414c0d26d6544c08ca7298c72df89919dac0e9ea565e3f7a85bb8b8ca562da3ba2c77a375105f40859938d0b801118a63dc49fb2ded97f26ff4cbc9171
+  data.tar.gz: 2740d9ef115e3d9551df141a4df4ca5d79e810ec2cdd2d0922fc55a2163f4f0d28eb842b691ce98a2337ffc071226a2d42c3fa135e92b49dbfeafbadf45d1b77

data/lib/synapse/config_generator/haproxy.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'json'
 require 'socket'
 require 'digest/sha1'
+require 'set'
 
 class Synapse::ConfigGenerator
   class Haproxy < BaseGenerator
@@ -11,6 +12,8 @@ class Synapse::ConfigGenerator
 
     NAME = 'haproxy'.freeze
 
+    HAPROXY_CMD_BATCH_SIZE = 4
+
     # these come from the documentation for haproxy (1.5 and 1.6)
     # http://haproxy.1wt.eu/download/1.5/doc/configuration.txt
     # http://haproxy.1wt.eu/download/1.6/doc/configuration.txt
@@ -1102,20 +1105,23 @@ class Synapse::ConfigGenerator
 
       # parse the stats output to get current backends
       cur_backends = {}
+      re = Regexp.new('^(.+?),(.+?),(?:.*?,){15}(.+?),')
+
       info.split("\n").each do |line|
         next if line[0] == '#'
 
-        parts = line.split(',')
-        next if ['FRONTEND', 'BACKEND'].include?(parts[1])
+        name, addr, state = re.match(line)[1..3]
+
+        next if ['FRONTEND', 'BACKEND'].include?(addr)
 
-        cur_backends[parts[0]] ||= []
-        cur_backends[parts[0]] << parts[1]
+        cur_backends[name] ||= {}
+        cur_backends[name][addr] = state
       end
 
       # build a list of backends that should be enabled
       enabled_backends = {}
       watchers.each do |watcher|
-        enabled_backends[watcher.name] = []
+        enabled_backends[watcher.name] = Set.new
         next if watcher.backends.empty?
         next if watcher.config_for_generator[name]['disabled']
 
@@ -1136,28 +1142,36 @@ class Synapse::ConfigGenerator
         end
       end
 
+      commands = []
+
       # actually enable the enabled backends, and disable the disabled ones
       cur_backends.each do |section, backends|
-        backends.each do |backend|
-          if enabled_backends.fetch(section, []).include? backend
-            command = "enable server #{section}/#{backend}\n"
+        backends.each do |backend, state|
+          if enabled_backends.fetch(section, Set.new).include? backend
+            next if state =~ /^UP/
+            command = "enable server #{section}/#{backend}"
           else
-            command = "disable server #{section}/#{backend}\n"
+            command = "disable server #{section}/#{backend}"
           end
+          # Batch commands so that we don't need to re-open the connection
+          # for every command.
+          commands << command
+        end
+      end
 
-          # actually write the command to the socket
-          begin
-            output = talk_to_socket(socket_file_path, command)
-          rescue StandardError => e
-            log.warn "synapse: restart required because socket command #{command} failed with "\
-                     "error #{e.inspect}"
+      commands.each_slice(HAPROXY_CMD_BATCH_SIZE) do |batch|
+        # actually write the command to the socket
+        begin
+          output = talk_to_socket(socket_file_path, batch.join(';') + "\n")
+        rescue StandardError => e
+          log.warn "synapse: restart required because socket command #{batch.join(';')} failed with "\
+                   "error #{e.inspect}"
+          @restart_required = true
+        else
+          unless output == "\n" * batch.size
+            log.warn "synapse: restart required because socket command #{batch.join(';')} failed with "\
+                     "output #{output}"
             @restart_required = true
-          else
-            unless output == "\n"
-              log.warn "synapse: restart required because socket command #{command} failed with "\
-                      "output #{output}"
-              @restart_required = true
-            end
           end
         end
       end

data/lib/synapse/version.rb

@@ -1,3 +1,3 @@
 module Synapse
-  VERSION = "0.14.1"
+  VERSION = "0.14.2"
 end

data/spec/lib/synapse/haproxy_spec.rb

@@ -179,7 +179,7 @@ describe Synapse::ConfigGenerator::Haproxy do
       end
 
       it 'does not cause a restart due to the socket' do
-        mock_socket_output = "example_service,somehost:5555"
+        mock_socket_output = "example_service,somehost:5555,0,0,0,0,200,0,0,0,0,0,,0,0,0,0,DOWN,0,"
         allow(subject).to receive(:talk_to_socket).with(socket_file_path, "show stat\n").and_return mock_socket_output
 
         expect(subject).to receive(:talk_to_socket).exactly(:once).with(
@@ -192,9 +192,9 @@ describe Synapse::ConfigGenerator::Haproxy do
       end
 
       it 'disables existing servers on the socket' do
-        mock_socket_output = "example_service,somehost:5555\ndisabled_watcher,somehost:5555"
+        mock_socket_output = "example_service,somehost:5555,0,0,0,0,200,0,0,0,0,0,,0,0,0,0,DOWN,0,\ndisabled_watcher,somehost:5555,0,0,0,0,200,0,0,0,0,0,,0,0,0,0,UP,0,"
         allow(subject).to receive(:talk_to_socket).with(socket_file_path, "show stat\n").and_return mock_socket_output
-
+        stub_const('Synapse::ConfigGenerator::Haproxy::HAPROXY_CMD_BATCH_SIZE', 1)
 
         expect(subject).to receive(:talk_to_socket).exactly(:once).with(
           socket_file_path, "enable server example_service/somehost:5555\n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synapse
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors:
 - Martin Rhoads
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -245,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Dynamic HAProxy configuration daemon