consul_bridge 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6469f568295acf5e72c1104633560d8855b37ab
-  data.tar.gz: 987d91802152806c539f512b44f1bf0f44792627
+  metadata.gz: b7a3236dc1a4f626e3d05b5623cc0ffd8ac68cfc
+  data.tar.gz: 0825eefa1db21df45fb39340275df04e182131fb
 SHA512:
-  metadata.gz: af4eb332b0ecdda47026cd2e92bf59963c9c9c32e29b4801fa71cb0eba14a6f2ad75c3c0f09c7faae236efd2042368d8f3ab8806980eacf466f7424b42d8cde4
-  data.tar.gz: f7933f4a64aa905939114aa24768e85e9d9668569d952a6638eb1a5a32fac5c778720fd4fedf0742e9e6d78673a984e0b3f1bc131276ad4e53b86f1f491671d2
+  metadata.gz: af77e4bf8ddc95fb33b8128647bac7a798c9f62ff608f873495134c4d5dc02b28f2ab9986d8927220a9d1a3d0bd52d0dc48bd512f5c03bb657a7f706f9f89cca
+  data.tar.gz: 2d3f4d36af4dc8b94d1b5a142a0314720ce05a6e7f14a036add11255297ddd15834ff9a4b8a2efac579d2c01cc38773bdf9991c04385cc3476a551ea04ca1e25

data/Dockerfile

@@ -4,7 +4,7 @@ MAINTAINER Ryan Schlesinger <ryan@outstand.com>
 RUN addgroup bridge && \
     adduser -S -G bridge bridge
 
-ENV CONSUL_BRIDGE_VERSION=0.1.0
+ENV CONSUL_BRIDGE_VERSION=0.1.1
 
 # Use this to install an official release
 RUN apk --no-cache add libxml2 libxslt \
@@ -15,10 +15,13 @@ RUN apk --no-cache add libxml2 libxslt \
 
 # Use this to install a development version
 # RUN apk --no-cache add build-base libxml2-dev libxslt-dev
-# COPY . /consul_bridge/
+# COPY Gemfile consul_bridge.gemspec /consul_bridge/
+# COPY lib/consul_bridge/version.rb /consul_bridge/lib/consul_bridge/
 # RUN cd /consul_bridge \
 #     && bundle config build.nokogiri --use-system-libraries \
-#     && bundle install \
+#     && bundle install
+# COPY . /consul_bridge/
+# RUN cd /consul_bridge \
 #     && bundle exec rake install
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh

data/lib/consul_bridge/bootstrap_consul.rb

@@ -1,6 +1,5 @@
 require 'consul_bridge/base'
 require 'consul_bridge/detect_consul'
-require 'consul_bridge/detect_consul_bootstrap'
 require 'consul_bridge/download_masters'
 require 'consul_bridge/join_consul'
 

data/lib/consul_bridge/cli.rb

@@ -11,13 +11,15 @@ module ConsulBridge
     option :bucket, aliases: '-b', required: true, type: :string, banner: '<s3_bucket>'
     option :container_name, aliases: '-n', required: true, type: :string, banner: '<container_name>'
     option :join_all, aliases: '-a', type: :boolean, default: false
+    option :verbose, aliases: '-v', type: :boolean, default: false
     def start
       $stdout.sync = true
       require 'consul_bridge/run_bridge'
       RunBridge.call(
         bucket: options[:bucket],
         container_name: options[:container_name],
-        join_all: options[:join_all]
+        join_all: options[:join_all],
+        verbose: options[:verbose]
       )
     end
   end

data/lib/consul_bridge/monitor_docker_events.rb

@@ -18,8 +18,12 @@ module ConsulBridge
         end
       rescue Docker::Error::TimeoutError
         retry
-      rescue Excon::Errors::SocketError
-        retry
+      rescue Excon::Errors::SocketError => e
+        if Errno::ENOENT === e.cause
+          raise
+        else
+          retry
+        end
       end
     end
   end

data/lib/consul_bridge/monitor_docker_events_actor.rb

@@ -13,10 +13,17 @@ module ConsulBridge
 
     def on_message(message)
       if message == :monitor
-        MonitorDockerEvents.call(
-          container_name: @container_name,
-          handler: ->(event){ @bootstrap_actor << :bootstrap }
-        )
+        begin
+          MonitorDockerEvents.call(
+            container_name: @container_name,
+            handler: ->(event){ @bootstrap_actor << :bootstrap }
+          )
+        rescue Excon::Errors::SocketError => e
+          if Errno::ENOENT === e.cause
+            puts "Warning: #{e.cause.message}; retrying in 30 seconds"
+            Concurrent::ScheduledTask.execute(30){ tell :monitor }
+          end
+        end
       else
         pass
       end

data/lib/consul_bridge/run_bridge.rb

@@ -5,17 +5,18 @@ require 'concurrent'
 
 module ConsulBridge
   class RunBridge < Base
-    attr_accessor :bucket, :container_name, :join_all
+    attr_accessor :bucket, :container_name, :join_all, :verbose
 
-    def initialize(bucket:, container_name:, join_all: false)
+    def initialize(bucket:, container_name:, join_all: false, verbose: false)
       self.bucket = bucket
       self.container_name = container_name
       self.join_all = join_all
+      self.verbose = verbose
     end
 
     def call
-      # Enable for actor debugging
-      # Concurrent.use_stdlib_logger(Logger::DEBUG)
+      Concurrent.use_stdlib_logger(Logger::DEBUG) if self.verbose
+
       self_read, self_write = IO.pipe
       %w(INT TERM).each do |sig|
         begin

data/lib/consul_bridge/version.rb

@@ -1,3 +1,3 @@
 module ConsulBridge
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul_bridge
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ryan Schlesinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -160,7 +160,6 @@ files:
 - lib/consul_bridge/bootstrap_consul_actor.rb
 - lib/consul_bridge/cli.rb
 - lib/consul_bridge/detect_consul.rb
-- lib/consul_bridge/detect_consul_bootstrap.rb
 - lib/consul_bridge/download_masters.rb
 - lib/consul_bridge/get_private_ip.rb
 - lib/consul_bridge/join_consul.rb

data/lib/consul_bridge/detect_consul_bootstrap.rb

@@ -1,7 +0,0 @@
-require 'consul_bridge/base'
-
-module ConsulBridge
-  class DetectConsulBootstrap < Base
-
-  end
-end