socotra-build 0.3.45 → 0.3.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91226f66d7746c00ecb70432bd194ebe10723d87
-  data.tar.gz: d12e1c5af58e1ca7c94b3b3cf938951fae5ba405
+  metadata.gz: e173cbb231f00b97623514d1ee2548899dd87d28
+  data.tar.gz: 99f0bbffceb76700d6fe3c2444d150dcce0c50a9
 SHA512:
-  metadata.gz: dede8a465546bb1c550181d328f6fb4ffc7b2664ea0cf8db9736f17da755bc4b3c8a234a188e5ca0155aa23116b0e600042a0853d1cebb5c7572475831451793
-  data.tar.gz: 33106cbf1d55be618098f6770751ff46df3e7040fd7a4e5f28dc059e4daf419670b68baa3dad6fea4ae628b233be043894f1c5b02cd6c6bb182de0e3888febaa
+  metadata.gz: 6c61977c0c970b25feafd15decd39a1dd784159a8fedfdaef789157238a7440bf1e1b587964745316db2c1278f0307084ecda2ecbfa98145f245763582f6632e
+  data.tar.gz: a309e16c835d59d0dc8bab260f02ca4f6d316e60965650313eef789393a845a447d68ad95c9bd7869b8f96cd8fefaf0a3f95d2e40b8d4c458c38d78f954e46c4

data/lib/socotra-build.rb

@@ -4,9 +4,9 @@ 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, timeout=0)
+    retry_count ||= 0
     begin
-        retry_count ||= 1
-        if tries == (retry_count)
+        if retry_count == (tries - 1)
             last_try = true
         else
             last_try = false
@@ -15,7 +15,7 @@ def self.safe_retry(cmd, description, error_message="command failed", raise_on_f
         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)
+        retry if (retry_count += 1) < (tries)
     end
 
     if last_try and raise_on_fail
@@ -94,17 +94,21 @@ def self.execute_cmd(cmd, timeout, log_out, log_err)
     end
 end
 
-def self.logger(log, success, retry_exec, raise_on_fail, log_out, log_err, log_level, error_message)
-
+def self.log(level, message)
     date = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+    puts "#{date} #{level}: #{message}"
+end
+
+def self.logger(log, success, retry_exec, raise_on_fail, log_out, log_err, log_level, error_message, last_try)
+
     if log
-        puts "#{date} INFO: Logs available here: #{log_err} and #{log_out}"
+        log("INFO", "Logs available here: #{log_err} and #{log_out}" )
     else
-        puts "#{date} INFO: Logs unavailable due to user settings"
+        log("INFO", "INFO: Logs unavailable due to user settings")
     end
 
     if not (success or retry_exec)
-        puts "#{date} #{log_level}: #{error_message}"
+        log(log_level, error_message)
         raise
     end
 
@@ -116,9 +120,10 @@ def self.logger(log, success, retry_exec, raise_on_fail, log_out, log_err, log_l
         end
 
         if log
-            puts "#{date} #{log_level}: see #{log_out} and #{log_err} for details"
+            log(log_level, "see #{log_out} and #{log_err} for details")
         end
-        puts "#{date} #{log_level}: #{error_message}"
+
+        log(log_level, error_message)
 
         if not last_try
             raise
@@ -129,12 +134,11 @@ 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 "#{date} INFO: Executing command: #{cmd_sanitized}"
+        log("INFO", "Executing command: #{cmd_sanitized}")
     else
-       puts "#{date} INFO: Not logging command"
+        log("INFO", "Not logging command")
     end
 
     if log
@@ -149,13 +153,12 @@ def self.system_safe(cmd=cmd, cmd_description=cmd_description, error_message=err
 
     elapsed = Time.now.to_i - start
 
-    date = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-    puts "#{date} INFO: #{cmd_description} took #{elapsed} seconds"
+    log("INFO", "#{cmd_description} took #{elapsed} seconds")
 
     file = File.open(log_out, "rb")
     out = file.read
 
-    logger(log, success, retry_exec, raise_on_fail, log_out, log_err, log_level, error_message)
+    logger(log, success, retry_exec, raise_on_fail, log_out, log_err, log_level, error_message, last_try)
 
     return success
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socotra-build
 version: !ruby/object:Gem::Version
-  version: 0.3.45
+  version: 0.3.46
 platform: ruby
 authors:
 - Chris Antenesse