socotra-build 0.3.36 → 0.3.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86b20ae3dc174f8bfffc93d5a0878f29794d91dd
-  data.tar.gz: 3fe73948b117a21a2e85c65d2bb94a925001e5e1
+  metadata.gz: 3897e7d32763b7664839b7a1d37a40fecde8be77
+  data.tar.gz: c8afb869e653520cff0516b4af3c8140f6592688
 SHA512:
-  metadata.gz: bc042eb3e01967b57071319c94b67ab22751b73a23f0f01030ff60d3e3224ad73776c572e5b34c218b7bf5e65f64b2a1ea723bd3ba96258b15f6215e88f10edc
-  data.tar.gz: 77b465c33888a6f32465f3d82a2896f8aa1f26c615156cead66bc4dec93173f371975a189215541885e1901f885df6a2a410a094bd66b39e281da5d3229d5ba7
+  metadata.gz: bf00ce16138808a32e9414e1cc3b0afe1eef059884e68c24c306c603444c4fc778901456b4519935656648dc04aee8cc568dbc614035fb996a42c28da4e4fa45
+  data.tar.gz: cffd38c8f30affcdfdbade74c5e1e02d03b1fd35f97f472189e58af28c31af59cc2cf520ff015092e550c8513a5e7e3d246ae8c60ab579a57c779a775f1ee54c

data/lib/socotra-build.rb

@@ -60,9 +60,9 @@ def self.pid_exists(pid)
     return true
 end
 
-def self.kill_pid(pid)
-    puts "killing #{pid}"
-   
+def self.kill_pid(pid, timeout)
+    puts "INFO: #{pid} timed out after #{timeout}, killing it"
+
     killpid = fork { Process.kill('INT', pid) }
     Process.detach(killpid)
     begin
@@ -85,18 +85,22 @@ def self.system_safe(cmd=cmd, cmd_description=cmd_description, error_message=err
        puts "Not logging command"
     end
 
-    log_out = "logs/#{cmd_description}_out.log"
-    log_err = "logs/#{cmd_description}_err.log"
+    if log
+        log_out = "logs/#{cmd_description}_out.log"
+        log_err = "logs/#{cmd_description}_err.log"
+    else
+        log_out = "/dev/null"
+        log_err = "/dev/null"
+    end
 
     pid = spawn(cmd, :out=>log_out, :err=>log_err)
-    puts "pid of spawned process: #{pid}"
     begin
         Timeout::timeout(timeout) do
             Process.wait(pid)
         end
     rescue Timeout::Error
         while pid_exists(pid)
-            if kill_pid(pid)
+            if kill_pid(pid, timeout)
                 break
             end
         end
@@ -105,16 +109,15 @@ def self.system_safe(cmd=cmd, cmd_description=cmd_description, error_message=err
 
     elapsed = Time.now.to_i - start
 
-    puts "\t#{cmd_description} took #{elapsed} seconds"
+    puts "\tINFO: #{cmd_description} took #{elapsed} seconds"
 
     file = File.open("logs/#{cmd_description}_out.log", "rb")
     out = file.read
 
     if log
-        puts "\tLogs available here: #{cmd_description}_err.log and #{cmd_description}_out.log\n\n"
+        puts "\tINFO: Logs available here: #{cmd_description}_err.log and #{cmd_description}_out.log\n\n"
     else
-        File.delete("logs/#{cmd_description}_err.log")
-        File.delete("logs/#{cmd_description}_out.log")
+        puts "\tINFO: Logs unavailable due to user settings"
     end
 
     if not success and raise_on_fail
@@ -125,9 +128,9 @@ def self.system_safe(cmd=cmd, cmd_description=cmd_description, error_message=err
             puts "#{log_level}: see logs/#{cmd_description}_out.log and #{cmd_description}_err.log for details"
         end
         raise "#{log_level}: #{error_message}"
-	end
+    end
 
-    return [success, out]
+    return success
 end
 
 def self.system_unsafe(cmd)
@@ -136,9 +139,8 @@ def self.system_unsafe(cmd)
 end
 
 def self.get_secret(key, subkey, log_identifier)
-    cmd = "vault read -field=#{subkey} #{key}"
-    status, secret = system_safe(cmd, log_identifier, "Get secret failed", true, "ERROR", false)
-	secret = secret.strip
+    secret = `vault read -field=#{subkey} #{key}`
+    secret = secret.strip
 
     return secret
 end

metadata

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