Merge pull request #68 from jcrobak/command-timeout-fix

Fix CommandTimeout handling
sous-chefs · Feb 11, 2014 · 74dc443 · 74dc443
2 parents e0a1ec7 + b75062f
commit 74dc443
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/libraries/helpers.rb b/libraries/helpers.rb
@@ -22,6 +22,9 @@ def initialize(timeout)
       end
     end
 
+    # Exception to signify that the docker command timed out.
+    class CommandTimeout < RuntimeError; end
+
     def cli_args(spec)
       cli_line = ''
       spec.each_pair do |arg, value|

diff --git a/providers/container.rb b/providers/container.rb
@@ -1,7 +1,5 @@
 include Helpers::Docker
 
-class CommandTimeout < RuntimeError; end
-
 def load_current_resource
   @current_resource = Chef::Resource::DockerContainer.new(new_resource)
   wait_until_ready!

diff --git a/providers/image.rb b/providers/image.rb
@@ -1,7 +1,5 @@
 include Helpers::Docker
 
-class CommandTimeout < RuntimeError; end
-
 def load_current_resource
   wait_until_ready!
   @current_resource = Chef::Resource::DockerImage.new(new_resource)

diff --git a/providers/registry.rb b/providers/registry.rb
@@ -1,7 +1,5 @@
 include Helpers::Docker
 
-class CommandTimeout < RuntimeError; end
-
 def load_current_resource
   @current_resource = Chef::Resource::DockerRegistry.new(new_resource)
   wait_until_ready!