socotra-build 0.3.43 → 0.3.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b74e386b956f6ed30f03fcc8add65ca1b776d04
-  data.tar.gz: 0c2bbedc6715d917d67a663c1ec0636259060e74
+  metadata.gz: 197109c5fb557b019df22f43cba84229117e5f6a
+  data.tar.gz: f9431064977331ee5655e704133a6c530e4aaa73
 SHA512:
-  metadata.gz: d349683f3b3c8f04d00decc5514143780264bc5d7727fc90e33a0552b59480613cfb52564ea4b326c6876f00ab8e71233b2322cd89447b75e78b50832b837e93
-  data.tar.gz: 0ffef18a6557022d84c82216ce84731116706d37305ba9a632025b2009b6eb31229f90d4d381c69d43f04317ace194166cdb35eef87020d005688fb91b8fa200
+  metadata.gz: 0abe5551f4a59406bc1b26af4e819d0f1477ebf445e8b659098922f501376395471acb04a5dc7b71af62cfca3b112f7f113ad4d720eb16819e0c08e31499ae02
+  data.tar.gz: 81123c91407bc7c09c74c243a222c9f197b206084bdebc68ee4cdced02bd07a8211b422044dabae26e90184c205da40c276be4139e90fa4ca710efe8b6d04818

data/lib/socotra-build.rb

@@ -5,20 +5,24 @@ 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, 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, timeout=timeout)
-    rescue
-        if (tries -= 1) > 0
-            sleep 5
-            retry unless (tries).zero?
+        retry_count ||= 1
+        if tries == (retry_count)
+            last_try = true
         else
-            puts "ERROR: see logs/#{description}_out.log and #{description}_err.log for details"
-            if raise_on_fail
-                raise "ERROR: #{error_message}"
-            end
+            last_try = false
         end
+
+        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, log_file_number=retry_count, last_try=last_try)
+    rescue
+        sleep 5
+        retry if (retry_count += 1) < (tries + 1)
     end
 
-    return status
+    if last_try and raise_on_fail
+        raise
+    else
+        return status
+    end
 end
 
 def self.get_sanitized_cmd(cmd)
@@ -90,19 +94,52 @@ def self.execute_cmd(cmd, timeout, log_out, log_err)
     end
 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)
+def self.logger(log, success, retry_exec, raise_on_fail, log_out, log_err, log_level, error_message)
+
+    date = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+    if log
+        puts "#{date} INFO: Logs available here: #{log_err} and #{log_out}"
+    else
+        puts "#{date} INFO: Logs unavailable due to user settings"
+    end
+
+    if not (success or retry_exec)
+        puts "#{date} #{log_level}: #{error_message}"
+        raise
+    end
+
+    if not success and retry_exec
+        if last_try and raise_on_fail
+            log_level = "ERROR"
+        else
+            log_level = "WARNING"
+        end
+
+        if log
+            puts "#{date} #{log_level}: see #{log_out} and #{log_err} for details"
+        end
+        puts "#{date} #{log_level}: #{error_message}"
+
+        if not last_try
+            raise
+        end
+    end
+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, log_file_number=1, last_try=true)
     start = Time.now.to_i
     
+    date = Time.now.strftime("%Y-%m-%d %H:%M:%S")
     cmd_sanitized = get_sanitized_cmd(cmd)
     if print_command
-        puts "Executing command: #{cmd_sanitized}\n"
+        puts "#{date} Executing command: #{cmd_sanitized}"
     else
        puts "Not logging command"
     end
 
     if log
-        log_out = "logs/#{cmd_description}_out.log"
-        log_err = "logs/#{cmd_description}_err.log"
+        log_out = "logs/#{cmd_description}_out.log.#{log_file_number}"
+        log_err = "logs/#{cmd_description}_err.log.#{log_file_number}"
     else
         log_out = "/dev/null"
         log_err = "/dev/null"
@@ -112,26 +149,13 @@ def self.system_safe(cmd=cmd, cmd_description=cmd_description, error_message=err
 
     elapsed = Time.now.to_i - start
 
-    puts "\tINFO: #{cmd_description} took #{elapsed} seconds"
+    date = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+    puts "#{date} INFO: #{cmd_description} took #{elapsed} seconds"
 
-    file = File.open("logs/#{cmd_description}_out.log", "rb")
+    file = File.open(log_out, "rb")
     out = file.read
 
-    if log
-        puts "\tINFO: Logs available here: #{cmd_description}_err.log and #{cmd_description}_out.log\n\n"
-    else
-        puts "\tINFO: Logs unavailable due to user settings"
-    end
-
-    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
-        raise "#{log_level}: #{error_message}"
-    end
+    logger(log, success, retry_exec, raise_on_fail, log_out, log_err, log_level, error_message)
 
     return success
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socotra-build
 version: !ruby/object:Gem::Version
-  version: 0.3.43
+  version: 0.3.44
 platform: ruby
 authors:
 - Chris Antenesse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies: []
 description: Common functions for build
 email: chris.antenesse@socotra.com
@@ -40,7 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Build library