hive-runner 2.1.24 → 2.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 334ad5a3c278a9cba01ae2ecc59ba974c5630210
-  data.tar.gz: 9d8ab4d1c69a7834f2091351c184848c58f9ef13
+  metadata.gz: 1d7be365592edb7a5230701b8349103112795d0d
+  data.tar.gz: 1b36dab91f7df3b6b5a17d6c0c1b223462c3e852
 SHA512:
-  metadata.gz: e3034646eef1aee0aabfdbe406865780543dcc6551a139f5ac3f3eae0feb4d8727187685f154b2b4241c1a8103edfa2828926cedd887bd541d612a0d1308dae0
-  data.tar.gz: 579dd5b3c4f4007e5a9ce6aa463359d4dbf8da1d05de225379ea394fef677696617f10e3174deaf686655f32d4eb52a019e04b8eb68ca13663c821ac788803b6
+  metadata.gz: b94468aba8dba9f4e0db4b316f92c9c4a875ec7db8fba87294ed084936dbcb3deeb30c82c2121ba59890c3fbd95743de0a8903cb3679d2240e1bba8233daac05
+  data.tar.gz: 74099f827f77ed2abdc49c8c5a6eac403e18429aa6c6427cb1344cb18d28b729493ce8a7da1c95e3e512e7ada7497f497ed139789ad1bdf2d58b4e057df6ea07

data/lib/hive/file_system.rb

@@ -11,6 +11,7 @@ module Hive
       make_directory(results_path)
       make_directory(logs_path)
       make_directory(testbed_path)
+      FileUtils.touch(script_errors_file)
     end
 
     def home_path
@@ -25,6 +26,10 @@ module Hive
       @logs_path ||= "#{home_path}/logs"
     end
 
+    def script_errors_file
+      @script_errors_file ||= File.expand_path('script_errors.txt', logs_path)
+    end
+
     def testbed_path
       @testbed_path ||= "#{home_path}/test_code"
     end

data/lib/hive/worker.rb

@@ -172,6 +172,7 @@ module Hive
 
         @log.info "Setting the execution variables in the environment"
         @script.set_env 'HIVE_RESULTS', @file_system.results_path
+        @script.set_env 'HIVE_SCRIPT_ERRORS', @file_system.script_errors_file
         @job.execution_variables.to_h.each_pair do |var, val|
           @script.set_env "HIVE_#{var.to_s}".upcase, val if ! val.kind_of?(Array)
         end
@@ -212,15 +213,20 @@ module Hive
         @log.error("  : #{e.backtrace.join("\n  : ")}")
       end
 
-      if exception
-        @job.error( exception.message )
+      if exception or File.size(@file_system.script_errors_file) > 0
         set_job_state_to :completed
         begin
           upload_files(@job, @file_system.results_path, @file_system.logs_path)
         rescue => e
           @log.error("Exception while uploading files: #{e.backtrace.join("\n  : ")}")
         end
-        raise exception
+        if exception
+          @job.error( exception.message )
+          raise exception
+        else
+          @job.error( 'Errors raised by execution script' )
+          raise 'See errors file for errors reported in test.'
+        end
       else
         @job.complete
         begin
@@ -406,7 +412,7 @@ module Hive
     # Keep the execution script running
     def keep_script_running?
       @log.debug("Keep Running check ")
-      if exceeded_time_limit? || parent_process_dead?
+      if exceeded_time_limit? or parent_process_dead? or File.size(@file_system.script_errors_file) > 0
         return false
       else
         return true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner
 version: !ruby/object:Gem::Version
-  version: 2.1.24
+  version: 2.1.25
 platform: ruby
 authors:
 - Joe Haig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chamber