evrone-ci-worker 0.2.0.pre20 → 0.2.0.pre21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5a832b47c09dc020a28cd54d6d30413398aebe8
-  data.tar.gz: da7a2ed9f4ed472df21223113645f8a4b8ff0815
+  metadata.gz: ca9ac9ab7de52d2163299b85791e6fdd51c69108
+  data.tar.gz: 528f5cd6f25983266ed8b4987e0cc678c7d8196a
 SHA512:
-  metadata.gz: e92f3791750e43e098acb9ab3094db886ef5acf92a47e9260c5c9e6395c22316057fbdf59604babeea4136ba9b942e10130955ff75fe11d228b49248abd1bdb1
-  data.tar.gz: 2eaf92d9e2476392d370b97459889e03627880606aa445c6190edc6c507759d626f36e19aa889e064bf097d80e79183ada9868816ca16c4338e96a3df84cafd9
+  metadata.gz: 637ddd3a0c32df67beb8e53ee9b246119219b0e331683623ceb27005816b67341a13a372d709c8e5371e6db143bfd4e67cbad23f0b9d8ddde954c0499f146f01
+  data.tar.gz: fb998d122f6437a833b33a75956f6a98fb5123ab3097e338e7d54fe3374a9a0f22dc1608674622a3919033494cf8cc7a9cc315c8ba395b558c411ab0d1c37219

data/lib/evrone/ci/worker/middlewares/docker_script.rb

@@ -38,7 +38,7 @@ module Evrone
             script << "env - HOME=$HOME bash #{file}"
             script = script.join(" && ")
 
-            env.ssh.spawn script, chdir: home, &env.job.method(:add_to_output)
+            env.ssh.spawn script, chdir: home, read_timeout: read_timeout, &env.job.method(:add_to_output)
           end
 
           def run_after_script(env)
@@ -49,7 +49,7 @@ module Evrone
             script << "env - HOME=$HOME bash #{file}"
             script = script.join(" && ")
 
-            env.ssh.spawn script, chdir: home, &env.job.method(:add_to_output)
+            env.ssh.spawn script, chdir: home, read_timeout: read_timeout, &env.job.method(:add_to_output)
           end
 
           def script_content(env, home)
@@ -77,6 +77,10 @@ module Evrone
             buf.strip
           end
 
+          def read_timeout
+            10 * 60
+          end
+
       end
     end
   end

data/lib/evrone/ci/worker/middlewares/update_job_status.rb

@@ -20,7 +20,9 @@ module Evrone
           rs = -1
           begin
             rs = app.call env
-          rescue Exception => e
+          rescue ::Timeout::Error => e
+            env.job.add_to_output("\n\nERROR: #{e.message}\n")
+          rescue ::Exception => e
             env.job.add_to_output("\n\nERROR: #{e.inspect}\n")
             logger.error("ERROR: #{e.inspect}\n    BACKTRACE:\n#{e.backtrace.map{|i| "    #{i}" }.join("\n")}")
             Common::ErrorNotifier.notify(e)

data/lib/evrone/ci/worker/version.rb

@@ -1,7 +1,7 @@
 module Evrone
   module CI
     module Worker
-      VERSION = "0.2.0.pre20"
+      VERSION = "0.2.0.pre21"
     end
   end
 end

data/spec/lib/worker/middlewares/update_job_status_spec.rb

@@ -62,7 +62,12 @@ describe Evrone::CI::Worker::UpdateJobStatus do
           its(:status) { should eq 5 }
         end
       end
+    end
+
+    context "Timeout::Error" do
+      let(:app) { ->(_) { raise Timeout::Error.new("Timeout Ignore Me") } }
 
+      it { should eq(-1) }
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evrone-ci-worker
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre20
+  version: 0.2.0.pre21
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evrone-ci-common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre20
+        version: 0.2.0.pre21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre20
+        version: 0.2.0.pre21
 - !ruby/object:Gem::Dependency
   name: evrone-ci-message
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre20
+        version: 0.2.0.pre21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre20
+        version: 0.2.0.pre21
 - !ruby/object:Gem::Dependency
   name: evrone-common-amqp
   requirement: !ruby/object:Gem::Requirement