multibinder 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 018cdd17d26576620f14c20c1f8070017bd43d29
-  data.tar.gz: dbf623adb438d0bb13255aa339bb38a0738371b6
+  metadata.gz: 00e47bebe4eec94c83ac430fb7d6c887e9159436
+  data.tar.gz: 5d839a52f9d793ca4c003dbcba8c2f5c5e3b97f9
 SHA512:
-  metadata.gz: 49abc85df2ce0e87c6cc407922746087df99332aafdbf181564d87e6b4458e529f553105d5521df92ca11ca50f491dd0d1cd24aabc8dfcbe660e7d4f3c504c8e
-  data.tar.gz: 45e8ee754b2cc547c5e12013b68a633ba4b187ed13ec6fadd7711c9d39a25def4f76f98de160412bd202a1e983c3404dbc2a6273e3ed64024892cbbd6581b4b6
+  metadata.gz: dbb81e35458b82592b48cf48d6250c796640a94072995f359c54ee08a9d173717442bc518e4e82d758cd437f6796387a9e5e40cfc82de2f054d52869fbdc018e
+  data.tar.gz: 9dc6ea20ad3ffdb185c2c7a90ff1cd553449356f5952679258418b4e89674cf26e8fab62a02e7b539d892f42300abaddaa71c6897ac04d30920755e516962abd

data/bin/multibinder-haproxy-erb

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+# Takes arguments that will be fed to haproxy, but sneakily tweaks the argument
+# to '-f' by ERB-parsing it and then providing the result.
+
+require 'multibinder'
+require 'socket'
+require 'fcntl'
+require 'erb'
+
+haproxy_call = ARGV
+
+# find and update '-f' argument to the output of ERB processing
+abort 'multibinder-haproxy expects a configuration file to be passed to haproxy' if haproxy_call.index('-f').nil?
+config_file_index = haproxy_call.index('-f') + 1
+haproxy_erb = haproxy_call[config_file_index]
+abort 'Config file must end with .erb' unless haproxy_erb.end_with? '.erb'
+haproxy_cfg = haproxy_erb.sub('.erb', '')
+haproxy_call[config_file_index] = haproxy_cfg
+
+def bind_tcp(ip, port)
+  if ENV['MULTIBINDER_SOCK'] && !ENV['MULTIBINDER_SOCK'].empty?
+    # if we have multibinder, use it to reuse our binds safely
+    server = MultiBinder.bind ip, port, { :backlog => 10240 }
+    "fd@#{server.fileno}"
+  else
+    # otherwise resort to the old fashioned binds with downtime/packet loss
+    puts "WARNING: Using haproxy direct binds, restarts will cause error!"
+    "#{ip}:#{port}"
+  end
+end
+
+new_data = ERB.new(File.read(haproxy_erb)).result
+File.write(haproxy_cfg, new_data)
+
+if haproxy_call.index('--erb-write-only')
+  puts 'ERB config write requested without launching command, exiting.'
+  exit 0
+end
+
+Process.exec *haproxy_call, :close_others => false

data/bin/multibinder-haproxy-wrapper

@@ -0,0 +1,64 @@
+#!/usr/bin/env ruby
+# Runs multibinder-haproxy-erb with the same arguments, supporting a USR2 for reload.
+
+dir = File.expand_path(File.dirname(__FILE__))
+$launch_haproxy = File.join(dir, "multibinder-haproxy-erb")
+
+SERVICE_DIR = File.basename(dir)
+SERVICE_NAME = SERVICE_DIR.split('-').drop(1).join('-')
+
+abort 'multibinder-haproxy-wrapper expects a pid file to be passed to haproxy' if ARGV.index('-p').nil?
+pid_file_index = ARGV.index('-p') + 1
+$PID_FILE = ARGV[pid_file_index]
+
+# launches a new instance. the haproxy-instance script automatically handles
+# everything: when no existing pid exists, it starts haproxy normally. when
+# an existing haproxy is running, it calls a new copy with `-sf` so that
+# haproxy safely hands over execution to the new process.
+def launch_instance
+  args = [$launch_haproxy] + ARGV
+  if File.exist? $PID_FILE
+    args << "-sf"
+    args.concat File.read($PID_FILE).split()
+  end
+
+  Process.spawn *args
+end
+
+def cleanup_existing
+  if File.exist? $PID_FILE
+    `kill -USR1 $(cat #{$PID_FILE}); rm #{$PID_FILE}`
+  end
+end
+
+# A SIGUSR2 tells us to safely relaunch
+Signal.trap("USR2") do
+  old_pids = File.read($PID_FILE)
+  
+  launch_instance
+
+  # wait a while for the pid file to change. after a while, give up and unblock reloads
+  for i in 0..20
+    break if File.read($PID_FILE) != old_pids
+    sleep 1
+  end
+end
+
+# If we try to kill haproxy, have them gracefully quit rather than terminate immediately
+Signal.trap("TERM") do
+  cleanup_existing
+  exit
+end
+
+# Start the first process itself
+launch_instance
+
+# Keep waitpid()ing forever.
+begin
+  loop do
+    Process.waitpid
+    sleep 10
+  end
+ensure
+  cleanup_existing
+end

data/haproxy/haproxy-multi@.service

@@ -0,0 +1,20 @@
+[Unit]
+Description=HAProxy Load Balancer
+Documentation=man:haproxy(1)
+Documentation=file:/usr/share/doc/haproxy/configuration.txt.gz
+After=network.target syslog.service multibinder.service
+Wants=syslog.service multibinder.service
+
+[Service]
+Environment=CONFIG=/etc/haproxy/%i.cfg.erb
+Environment=MULTIBINDER_SOCK=/run/multibinder.sock
+EnvironmentFile=-/etc/default/haproxy
+ExecStartPre=/usr/local/bin/multibinder-haproxy-erb /usr/sbin/haproxy -f ${CONFIG} -c -q
+ExecStart=/usr/local/bin/multibinder-haproxy-wrapper /usr/sbin/haproxy -Ds -f ${CONFIG} -p /run/haproxy-%i.pid $EXTRAOPTS
+ExecReload=/bin/sh -c "/usr/local/bin/multibinder-haproxy-erb /usr/sbin/haproxy -c -f ${CONFIG}; /bin/kill -USR2 $MAINPID"
+ExecStop=/bin/kill -TERM $MAINPID
+KillMode=none
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

data/haproxy/multibinder.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Multibinder
+After=network.target
+
+[Service]
+ExecStart=/usr/local/bin/multibinder /run/multibinder.sock
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

data/lib/multibinder/version.rb

@@ -1,3 +1,3 @@
 module MultiBinder
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: multibinder
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Theo Julienne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: 
@@ -43,15 +43,21 @@ email:
 - theojulienne@github.com
 executables:
 - multibinder
+- multibinder-haproxy-erb
+- multibinder-haproxy-wrapper
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/multibinder
+- bin/multibinder-haproxy-erb
+- bin/multibinder-haproxy-wrapper
+- haproxy/haproxy-multi@.service
+- haproxy/multibinder.service
 - lib/multibinder.rb
 - lib/multibinder/version.rb
 - multibinder.gemspec
@@ -74,17 +80,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.0.14
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: multibinder is a tiny ruby server that makes writing zero-downtime-reload