staypuft 0.5.11 → 0.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfd9909dd712c0201b515446f4951be152eee735
-  data.tar.gz: 7c7c028f24023a15f0e4fc7cc642b1cb1509dca3
+  metadata.gz: bd64239cd0fdf64f05f4ece53506110596323911
+  data.tar.gz: 113d7d8b349b75bb5774503963ac8b17b8d3eb36
 SHA512:
-  metadata.gz: b829c2dd39969931c524737861114872bed3deb45b432e1a6eb9077cd1e6d376f3cdb01828d180e39b9ffdd4177d8fd2258f9660c2b5d056dcee47f3ec8fdde0
-  data.tar.gz: 4f882c8cb18b443546a518d6b66f8a1d84c249c7896e8a8b45edd8fffc658d84c9f07d1445cc23150d896b02695231788a9777d5fe514d79b5f51a0f935a4f4e
+  metadata.gz: 7c8ceedace14908cc583ebeda720605ab7ac771358d47d914c2325a29307f8aa701ce9a3f931c04d0c11e21936f4a09f57afe3ed93346e0acc246860660cc82b
+  data.tar.gz: 2813a4656231e0517ea90ffc4de30bc7dd742f4756ef9364b244139ef60c3aaf3e5f52d7f741f56cc541889a56dfd663c67d5042765669824e0a2836e2746d4b

data/app/lib/actions/staypuft/host/wait_until_ready.rb

@@ -16,6 +16,8 @@ module Actions
 
       class WaitUntilReady < Actions::Base
 
+        STARTUP_GRACE_PERIOD = 60
+
         middleware.use Actions::Staypuft::Middleware::AsCurrentUser
         include Dynflow::Action::Polling
 
@@ -42,14 +44,26 @@ module Actions
         end
 
         def poll_external_task
-          host = ::Host.find input.fetch(:host_id)
-          host.send :ssh_open?, host.ip
+          if !output[:ssh_port_open_at] && check_ssh_port_open
+            output[:ssh_port_open_at] ||= Time.now.to_i
+          end
+
+          if output[:ssh_port_open_at]
+            Time.now.to_i - output[:ssh_port_open_at] > STARTUP_GRACE_PERIOD
+          else
+            false
+          end
         end
 
         def poll_interval
           5
         end
 
+        def check_ssh_port_open
+          host = ::Host.find input.fetch(:host_id)
+          host.send :ssh_open?, host.ip
+        end
+
       end
     end
   end

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.5.11'
+  VERSION = '0.5.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.12
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks