socotra-build 0.3.29 → 0.3.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e49e8e4662b8506232320362045eb61a61a81e08
-  data.tar.gz: 220ffb9b3142abd226248e41cef5ac4eb2a03761
+  metadata.gz: 927edabbae63ccee8968062ea62b9e393a6ffeb6
+  data.tar.gz: 36353731e2d8bcc9f9f17bd9fd8b3f4b71b0e0c4
 SHA512:
-  metadata.gz: 10f1dd3812057bc4bc7cd6c85a1a2e54d1ab4347de9f7633279a2981f662bdec6ad664e27569a46272e93fdf813f74a2a18f5499be27ba891fefc8e2df3deebf
-  data.tar.gz: a1f9e0d9c4a3127ed79b19319013d912800c0fe98ecdb91e0406ee51f0d6f28f75d57c804745252781b15087a5f52eeaaab08419afc662592dd18e166e61e2ad
+  metadata.gz: 5f3a4f410376ef13c03e5dc732677cac0260cb7d3fa4094e4797a728816897aafdee297f5cec0ce3835a7fea3752460aa8339657e91243a365bceba5ede0d965
+  data.tar.gz: 30d79b0cfc3d66792717ac9b82aa22c20d1d48de93f7416a40e8eec0e020cfdbe0f958710c64980d26391655fbd12944bce07829d103c13cd49ac597fd69d648

data/lib/socotra-build.rb

@@ -1,10 +1,11 @@
 require 'open3'
 require 'set'
+require 'timeout'
 require_relative 's3_uploader'
 
-def self.safe_retry(cmd, description, error_message="command failed", raise_on_fail=true, log_level="ERROR", log=true, tries=3)
+def self.safe_retry(cmd, description, error_message="command failed", raise_on_fail=true, log_level="ERROR", log=true, tries=3, timeout=0)
     begin
-        status, output = system_safe(cmd, description, error_message, raise_on_fail=raise_on_fail, log_level=log_level, log=log, print_command=true, retry_exec=true)
+        status, output = system_safe(cmd, description, error_message, raise_on_fail=raise_on_fail, log_level=log_level, log=log, print_command=true, retry_exec=true, timeout=timeout)
     rescue
         if (tries -= 1) > 0
             sleep 5
@@ -49,11 +50,7 @@ def self.get_sanitized_cmd(cmd)
     cmd = cmd.join(' ')
 end
 
-def self.system_safe(cmd, cmd_description, error_message, raise_on_fail=true, log_level="ERROR", log=true, print_command=true, retry_exec=false)
-    Signal.trap("TERM") do
-        puts "SIGTERM caught, quitting..."
-    end
-
+def self.system_safe(cmd=cmd, cmd_description=cmd_description, error_message=error_message, raise_on_fail=true, log_level="ERROR", log=true, print_command=true, retry_exec=false, timeout=0)
     start = Time.now.to_i
     
     cmd_sanitized = get_sanitized_cmd(cmd)
@@ -62,31 +59,35 @@ def self.system_safe(cmd, cmd_description, error_message, raise_on_fail=true, lo
     else
        puts "Not logging command"
     end
-    
-    stdout, stderr, status = Open3.capture3(cmd)
-    elapsed = Time.now.to_i - start
 
-    if log
-        File.open("logs/#{cmd_description}_out.log" , 'w') { |file| file.write(stdout) }
-        File.open("logs/#{cmd_description}_err.log" , 'w') { |file| file.write(stderr) }
-        puts "\tLogs available here: #{cmd_description}_err.log and #{cmd_description}_out.log\n\n"
-    else
-        puts "Not logging due to secrets in output"
+    pid = spawn(cmd, :out=>"logs/#{cmd_description}_out.log", :err=>"logs/#{cmd_description}_err.log")
+    begin
+        Timeout::timeout(timeout) do
+            Process.wait(pid)
+            success = true
+        end
+    rescue Timeout::Error
+        Process.kill('INT', pid)
+        success = false
     end
 
+    puts "\tLogs available here: #{cmd_description}_err.log and #{cmd_description}_out.log\n\n"
+
+    elapsed = Time.now.to_i - start
+
     puts "\t#{cmd_description} took #{elapsed} seconds"
 
-	if not status.success? and raise_on_fail
+    if not success and raise_on_fail
         if retry_exec
             log_level = "WARNING"
         end
-		if log
-			puts "#{log_level}: see logs/#{cmd_description}_out.log and #{cmd_description}_err.log for details"
-		end
+        if log
+            puts "#{log_level}: see logs/#{cmd_description}_out.log and #{cmd_description}_err.log for details"
+        end
         raise "#{log_level}: #{error_message}"
 	end
 
-	return [status.success?, stdout]
+    return [success, stdout]
 end
 
 def self.system_unsafe(cmd)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socotra-build
 version: !ruby/object:Gem::Version
-  version: 0.3.29
+  version: 0.3.30
 platform: ruby
 authors:
 - Chris Antenesse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies: []
 description: Common functions for build
 email: chris.antenesse@socotra.com