docker_boss 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fef17dd46df84f08ca1dabb724e7790b8befbe4d
-  data.tar.gz: bddc9f196485a9a320311068c76680fd8df410cc
+  metadata.gz: 5c03ceae67ce9ce3052da36aeee4d4c69e39a8d5
+  data.tar.gz: 33ba01946a3c6349e8c31d72fa28b8a2bdcd7b58
 SHA512:
-  metadata.gz: 85e9b3a2c78142d41459800c6c5deaf64b34f5a364cb3b6dc8fecd2f96679e655c128ce3791fa88a68dfd17656d9868c4c1e01ca0e978bb668ef8af09dd0b30d
-  data.tar.gz: ee4f6111cf1a9c6bc533a5b7ff1d92afde6e4d08f2018293a2ca2bc1a6db146db41b2bc3ae633c041ce1128492b1c673d38f4e232318aba9d1e6ef1c7995aaef
+  metadata.gz: 374c2b5725ac24feab755bfa0a61127e6983a4bde7768c397b7d04ef4f2196b7378e7672fb77a662b08a1243054cbef730cd5d1839f4c233cba86ccdd2efa7ec
+  data.tar.gz: efdbd8dfd6e725dd8a76f914f6840c72edb43bbafaab8d0d654c38de36ab9dc1b389f51a6af77b5661297564ac0f1b5b31837d6abef02b5406c33d063e625819

data/README.md

@@ -255,6 +255,7 @@ The `server` setting defines the host and port of the etcd server. SSL and basic
 The `setup` setting is a template, each line of which can manipulate keys in etcd. These key manipulations are run once when the module/DockerBoss starts, and can be used to ensure a clean slate, free of any old keys from a previous run. The `setup` template can use the `interface_ipv4` and `interface_ipv6` helpers. Each line must follow one of the following formats:
 
  - `ensure <key> <value>` - sets a given key in etcd to the given value.
+ - `ensure_dir <key>` - creates the given key as a directory in etcd.
  - `absent <key>` - removes a given key in etcd.
  - `absent_recursive <key>` removes a key and all its children.
 
@@ -275,13 +276,13 @@ etcd:
   setup: |
     absent_recursive /skydns/docker
     absent_recursive /vhosts
-    ensure /skydns/docker/dockerhost/etcd <%= as_json(host: interface_ipv4('docker0'), port: '4001') %>
+    ensure /skydns/docker/dockerhost/etcd <%= as_json(host: interface_ipv4('docker0'), port: 4001) %>
 
   sets:
     skydns: |
       <% if container['Config']['Env'].has_key? 'SERVICES' %>
         <% container['Config']['Env']['SERVICES'].split(',').each do |s| %>
-          ensure <%= "/skydns/#{s.split(':')[0].split('.').reverse.join('/')}" %> <%= as_json(host: container['NetworkSettings']['IPAddress'], port: s.split(':')[1]) %>
+          ensure <%= "/skydns/#{s.split(':')[0].split('.').reverse.join('/')}" %> <%= as_json(host: container['NetworkSettings']['IPAddress'], port: s.split(':')[1].to_i) %>
         <% end %>
       <% elsif container['Config']['Env'].has_key? 'SERVICE_NAME' %>
         ensure <%= "/skydns/#{container['Config']['Env']['SERVICE_NAME'].split('.').reverse.join('/')}" %> <%= as_json(host: container['NetworkSettings']['IPAddress']) %>

data/lib/docker_boss/cli.rb

@@ -44,6 +44,15 @@ class DockerBoss::CLI < Thor
     rescue Docker::Error::DockerError => e
       DockerBoss.logger.fatal "Error communicating with Docker: #{e.message}"
       exit 1
+    rescue SignalException => e
+      case Signal.signame(e.signo)
+      when "TERM", "INT"
+        DockerBoss.logger.info "Received SIGTERM/SIGINT, shutting down."
+        exit 0
+      else
+        DockerBoss.logger.fatal "Fatal unhandled signal in event loop: #{Signal.signame(e.signo)}"
+        e.backtrace.each { |line| DockerBoss.logger.fatal "    #{line}" }
+      end
     rescue Exception => e
       DockerBoss.logger.fatal "Fatal unhandled exception in event loop: #{e.class.name} -> #{e.message}"
       e.backtrace.each { |line| DockerBoss.logger.fatal "    #{line}" }

data/lib/docker_boss/modules/etcd.rb

@@ -34,6 +34,9 @@ class DockerBoss::Module::Etcd < DockerBoss::Module
           @client.delete(k, recursive: true)
         rescue ::Etcd::KeyNotFound
         end
+      when 'ensure_dir'
+        DockerBoss.logger.debug "etcd: (setup) Set key `#{k}` (dir)"
+        @client.set(k, dir: true)
       when 'ensure'
         DockerBoss.logger.debug "etcd: (setup) Set key `#{k}` => `#{v}`"
         @client.set(k, value: v)

data/lib/docker_boss/version.rb

@@ -1,3 +1,3 @@
 module DockerBoss
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker_boss
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Alex Hornung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api