multibinder 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00e47bebe4eec94c83ac430fb7d6c887e9159436
-  data.tar.gz: 5d839a52f9d793ca4c003dbcba8c2f5c5e3b97f9
+  metadata.gz: 48c7529264a07e02ceede53195b8865e5d333b55
+  data.tar.gz: a46092b200c70902b02fe4d3ba9a76dfb64eb6c0
 SHA512:
-  metadata.gz: dbb81e35458b82592b48cf48d6250c796640a94072995f359c54ee08a9d173717442bc518e4e82d758cd437f6796387a9e5e40cfc82de2f054d52869fbdc018e
-  data.tar.gz: 9dc6ea20ad3ffdb185c2c7a90ff1cd553449356f5952679258418b4e89674cf26e8fab62a02e7b539d892f42300abaddaa71c6897ac04d30920755e516962abd
+  metadata.gz: a9353acb7fad02a3a1d84b5a8ab4befa95c3120db2bde5bcaa8db361fdcaa8a248d0bf4db6f08fad4397f76afaf2cdc5b7c612569748ffc1e8b4b8da68cfbe61
+  data.tar.gz: 63cde39aa688749c9d3800f64e408461b9dfcc2e74b56b6d199d6d312042c403f059d96749f37ec403f46b35cdf92eb408601b54db91259bb0876a925d46567a

data/bin/multibinder-haproxy-erb

@@ -13,8 +13,8 @@ haproxy_call = ARGV
 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', '')
+abort 'Config file must end with .erb or .mb' unless haproxy_erb.end_with? '.erb' or haproxy_erb.end_with? '.mb'
+haproxy_cfg = haproxy_erb.sub(/\.(erb|mb)$/, '')
 haproxy_call[config_file_index] = haproxy_cfg
 
 def bind_tcp(ip, port)

data/bin/multibinder-haproxy-wrapper

@@ -39,7 +39,10 @@ Signal.trap("USR2") do
 
   # 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
+    begin
+      break if File.read($PID_FILE) != old_pids
+    rescue Errno::ENOENT
+    end
     sleep 1
   end
 end
@@ -61,4 +64,4 @@ begin
   end
 ensure
   cleanup_existing
-end
+end

data/haproxy/README.md

@@ -0,0 +1,95 @@
+## multibinder + HAProxy
+
+HAProxy by default doesn't include support for zero-downtime reloads. multibinder was developed to work with HAProxy, and has some useful wrappers included that allow running multiple HAProxy instances with multibinder on the same machine, while enabling zero-downtime reloads. 
+
+### Installation on Ubuntu 16.04
+
+Install multibinder and dependencies:
+```
+sudo apt-get install -y haproxy ruby
+sudo gem install multibinder
+```
+
+The multibinder systemd scripts automatically support multiple haproxy instances, so stop and disable the default haproxy service:
+```
+sudo systemctl stop haproxy
+sudo systemctl disable haproxy
+```
+
+Install the `multibinder` and `haproxy-multi@` systemd service files, and start multibinder itself:
+```
+sudo cp $(gem environment gemdir)/gems/multibinder-0.0.4/haproxy/*.service /etc/systemd/system/
+sudo systemctl daemon-reload
+
+sudo systemctl enable multibinder
+sudo systemctl start multibinder
+```
+
+Create your first haproxy service configuration file, replacing all bind IP/ports with ERB code like the following:
+```
+cat >/etc/haproxy/foo.cfg.erb <<EOF
+global
+    user haproxy
+    group haproxy
+    daemon
+    maxconn 256
+
+defaults
+    mode http
+    timeout connect 5000ms
+    timeout client 50000ms
+    timeout server 50000ms
+
+frontend http-in
+    bind <%= bind_tcp('0.0.0.0', 80) %>
+EOF
+```
+
+Now start your multibinder-enabled haproxy `foo` service!
+```
+sudo systemctl enable haproxy-multi@foo
+sudo systemctl start haproxy-multi@foo
+```
+
+You'll have a process tree like the following:
+```
+$ sudo systemctl status haproxy-multi@foo
+● haproxy-multi@foo.service - HAProxy Load Balancer
+   Loaded: loaded (/etc/systemd/system/haproxy-multi@.service; enabled; vendor preset: enabled)
+   Active: active (running) since Mon 2016-10-31 20:56:28 UTC; 1s ago
+     Docs: man:haproxy(1)
+           file:/usr/share/doc/haproxy/configuration.txt.gz
+  Process: 3092 ExecStop=/bin/kill -TERM $MAINPID (code=exited, status=0/SUCCESS)
+  Process: 3076 ExecReload=/bin/sh -c /usr/local/bin/multibinder-haproxy-erb /usr/sbin/haproxy -c -f ${CONFIG}; /bin/kill -USR2 $MAINPID (code=exited, status=0/SUCCESS)
+  Process: 3105 ExecStartPre=/usr/local/bin/multibinder-haproxy-erb /usr/sbin/haproxy -f ${CONFIG} -c -q (code=exited, status=0/SUCCESS)
+ Main PID: 3109 (multibinder-hap)
+   CGroup: /system.slice/system-haproxy\x2dmulti.slice/haproxy-multi@foo.service
+           ├─3109 /usr/bin/ruby2.3 /usr/local/bin/multibinder-haproxy-wrapper /usr/sbin/haproxy -Ds -f /etc/haproxy/foo.cfg.erb -p /run/haproxy-foo.pid
+           ├─3113 /usr/sbin/haproxy -Ds -f /etc/haproxy/foo.cfg -p /run/haproxy-foo.pid
+           └─3115 /usr/sbin/haproxy -Ds -f /etc/haproxy/foo.cfg -p /run/haproxy-foo.pid
+
+Oct 31 20:56:28 ip-172-31-8-204 systemd[1]: Starting HAProxy Load Balancer...
+Oct 31 20:56:28 ip-172-31-8-204 systemd[1]: Started HAProxy Load Balancer.
+```
+
+With multibinder running separately from the haproxy process(es):
+```
+$ sudo systemctl status multibinder
+● multibinder.service - Multibinder
+   Loaded: loaded (/etc/systemd/system/multibinder.service; enabled; vendor preset: enabled)
+   Active: active (running) since Mon 2016-10-31 20:50:05 UTC; 7min ago
+ Main PID: 2751 (multibinder)
+    Tasks: 2
+   Memory: 4.9M
+      CPU: 44ms
+   CGroup: /system.slice/multibinder.service
+           └─2751 /usr/bin/ruby2.3 /usr/local/bin/multibinder /run/multibinder.sock
+
+Oct 31 20:50:05 ip-172-31-8-204 systemd[1]: Started Multibinder.
+Oct 31 20:50:05 ip-172-31-8-204 multibinder[2751]: Listening for binds on control socket: /run/multibinder.sock
+```
+
+Reloading an haproxy instance safely can then be requested through systemctl:
+```
+$ sudo systemctl reload haproxy-multi@foo
+```

data/lib/multibinder.rb

@@ -1,5 +1,8 @@
 require 'multibinder/version'
 require 'json'
+require 'securerandom'
+require 'socket'
+require 'fcntl'
 
 module MultiBinder
   def self.bind(address, port, options={})
@@ -11,6 +14,7 @@ module MultiBinder
     binder.sendmsg JSON.dump({
       :jsonrpc => '2.0',
       :method => 'bind',
+      :id => SecureRandom.uuid,
       :params => [{
         :address => address,
         :port => port,

data/lib/multibinder/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multibinder
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Theo Julienne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-31 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,6 +56,7 @@ files:
 - bin/multibinder
 - bin/multibinder-haproxy-erb
 - bin/multibinder-haproxy-wrapper
+- haproxy/README.md
 - haproxy/haproxy-multi@.service
 - haproxy/multibinder.service
 - lib/multibinder.rb