xp5k 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 031feb0e6c261fbe46c2bf08f5e3c36961ff4d23
-  data.tar.gz: 4eb52d5d2606387f344b74481614eed33cdf3e76
+  metadata.gz: '0821a928a8e43b38bff1413c8bd7015075a2185e'
+  data.tar.gz: 35f842381e74abcc6267d384b8cc119656e42d6d
 SHA512:
-  metadata.gz: 0f8a668ba3d19f349534c49e83caac2ed37af134a7a6254f9065ef1360b9b4321cd0598eac40d9b16972fd7c1b2050d7c848f48aed35dd9c6049e8e303458c4a
-  data.tar.gz: 8746b87af5a20cc557c400901880069e3e5f87eafa214701fef722730703b388f8768eaef19b5b5df3f5b67b204c17f5e38eb9ec271b76ed72eddc15015fe6ec
+  metadata.gz: 1a9f924f1db0f797afa5c28f70544033a59a0c79c32541471b63bd8992cf73e588b9a57fcb33e3704ab902c08587637d9962afd686bcdfb82484b17086c2be20
+  data.tar.gz: 167129ceb3f99a09348c5a8f5df3943e6e925cc2fee5fe941e69610fb22bfb5e6aba2f1db1ff724692018e8b394637d9edb41a59dc956c633ab633802809c26c

data/lib/xp5k/rake/dsl.rb

@@ -68,7 +68,11 @@ module XP5K
         cmd_env = options[:environment].map do |key, value|
           "#{key}=#{value}"
         end
-        
+
+        options[:retry] ||= ( XP5K::Config[:onRetry] ||= false )
+        options[:retryCount] ||= ( XP5K::Config[:onRetryCount] ||= 3 )
+        options[:retryDelay] ||= ( XP5K::Config[:onRetryDelay] ||= 3 )
+
         # net/ssh specific options
         options[:ssh] ||= {}
 
@@ -83,6 +87,8 @@ module XP5K
           end
         end
 
+        retryCount = XP5K::Config[:onRetryCount]
+
         until all_connected
           failed = false
           gateway_options = {}
@@ -96,15 +102,23 @@ module XP5K
               begin
                 while host = workq.pop(true)
                   begin
-                    timeout(5) do
+                    Timeout.timeout(5) do
                       ssh_session[host] = gateway.ssh(host, options[:user], options[:ssh])
                       puts "Connected to #{host}..."
                     end
                   rescue Timeout::Error, Net::SSH::Disconnect, Exception => e
-                    puts "Removing #{host} (#{e.message})..."
-                    hosts.delete host
-                    failed_servers << host
-                    failed = true
+                    if not options[:retry]
+                      puts "Removing #{host} (#{e.message})..."
+                      hosts.delete host
+                      failed_servers << host
+                    elsif retryCount > 0
+                      puts "Error connecting to #{host}. Retry in #{options[:retryDelay]}s (#{retryCount} attempts)."
+                      retryCount -= 1
+                      sleep options[:retryDelay]
+                    else
+                      raise "Error connecting to #{host} after #{options[:retryCount]} attempts."
+                    end
+                      failed = true
                   end
                 end
 

data/lib/xp5k/version.rb

@@ -1,3 +1,3 @@
 module XP5K
-  VERSION='0.0.18'
+  VERSION='0.0.19'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xp5k
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Pascal Morillon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: A small Grid'5000 helper