vx-container_connector 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e353cc8520cbb57bf2208caba4dd5d4fd623f86
-  data.tar.gz: e7047733f64839506517f74f0ebeefb6cf393610
+  metadata.gz: e8d1d2a512151ac69a604b6756aa939d6aa6be35
+  data.tar.gz: e5e247f6562b4e15779f41098c1ed97d5ffbc72f
 SHA512:
-  metadata.gz: 32235b2e4cc02425e6becc923ebffbf7fb621df3602d981bb48db33e039fe54cce55761ce5d52394ba7ec94301afe9d66bb1c5543714c6991c5b8759989b8815
-  data.tar.gz: 79e0ffc0ba1c3ef204aaf947c121c105c285cfca9f0a81597911bd6b8bd8effbcb7f0ad3aa5315762c2f55fc6fdc50642bd4df4caf004884f20c4e06b3a16b0e
+  metadata.gz: a375c89e7b098c1011f7be78ddb00f04a27d1b7fdcd7b00332cb175136243c8c68c7fb2c51ceaef7b0a3c6db4f00eb7302f31a7135fc8668092997dae84315fe
+  data.tar.gz: 1a352e186e139f0a22827903ebffe2a2a565cfe4b1d0f846608f51f0cff45ceff4c857401672b21abb8863bca63b234112d5d8ce4f727cfaf688a63b66011cc8

data/lib/vx/container_connector/docker.rb

@@ -94,8 +94,8 @@ module Vx
             sleep 3
             yield container
           ensure
-            container.stop
-            logger.info "stop container #{container.id}"
+            container.kill
+            logger.info "kill container #{container.id}"
           end
         end
 

data/lib/vx/container_connector/mixin/retriable.rb

@@ -0,0 +1,40 @@
+module Vx
+  module ContainerConnector
+    module Retriable
+      # This will catch any exception and retry twice (three tries total):
+      #   with_retries { ... }
+      #
+      # This will catch any exception and retry four times (five tries total):
+      #   with_retries(:limit => 5) { ... }
+      #
+      # This will catch a specific exception and retry once (two tries total):
+      #   with_retries(Some::Error, :limit => 2) { ... }
+      #
+      # You can also sleep inbetween tries. This is helpful if you're hoping
+      # that some external service recovers from its issues.
+      #   with_retries(Service::Error, :sleep => 1) { ... }
+      #
+      def with_retries(*args, &block)
+        options = args.last.is_a?(Hash) ? args.pop : {}
+        exceptions = args
+
+        options[:limit] ||= 3
+        options[:sleep] ||= 0
+        exceptions = [Exception] if exceptions.empty?
+
+        retried = 0
+        begin
+          yield
+        rescue *exceptions => e
+          if retried + 1 < options[:limit]
+            retried += 1
+            sleep options[:sleep]
+            retry
+          else
+            raise e
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vx/container_connector/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module ContainerConnector
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

data/lib/vx/container_connector.rb

@@ -4,8 +4,10 @@ require File.expand_path("../container_connector/errors",  __FILE__)
 module Vx
   module ContainerConnector
 
-    autoload :Local,  File.expand_path("../container_connector/local",  __FILE__)
-    autoload :Docker, File.expand_path("../container_connector/docker", __FILE__)
+    autoload :Local,     File.expand_path("../container_connector/local",  __FILE__)
+    autoload :Docker,    File.expand_path("../container_connector/docker", __FILE__)
+    autoload :Retriable, File.expand_path("../container_connector/mixin/retriable", __FILE__)
+
 
     extend self
 

data/spec/lib/mixin/retriable_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+class TestRetriable
+  include Vx::ContainerConnector::Retriable
+
+  class Error < Exception ; end
+end
+
+describe Vx::ContainerConnector::Retriable do
+  let(:proxy) { TestRetriable.new }
+
+  it "should rescue 2 times" do
+    expect(test_retriable(2)).to eq :pass
+  end
+
+  it "should fail on 3 attempt" do
+    expect {
+      test_retriable(3)
+    }.to raise_error(TestRetriable::Error, "0")
+  end
+
+  def test_retriable(n)
+    proxy.with_retries(TestRetriable::Error, limit: 3, sleep: 0.1) do
+      if n != 0
+        n -= 1
+        raise TestRetriable::Error.new(n.to_s)
+      end
+      :pass
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-container_connector
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -113,10 +113,12 @@ files:
 - lib/vx/container_connector/errors.rb
 - lib/vx/container_connector/local.rb
 - lib/vx/container_connector/local/spawner.rb
+- lib/vx/container_connector/mixin/retriable.rb
 - lib/vx/container_connector/version.rb
 - spec/lib/container_connector_spec.rb
 - spec/lib/docker_spec.rb
 - spec/lib/local_spec.rb
+- spec/lib/mixin/retriable_spec.rb
 - spec/spec_helper.rb
 - vx-container_connector.gemspec
 homepage: ''
@@ -147,4 +149,5 @@ test_files:
 - spec/lib/container_connector_spec.rb
 - spec/lib/docker_spec.rb
 - spec/lib/local_spec.rb
+- spec/lib/mixin/retriable_spec.rb
 - spec/spec_helper.rb