cloud66_agent 0.0.1.pre5 → 0.0.1.pre6

data/bin/cloud66_agent

@@ -80,7 +80,7 @@ else
 		else
 			Cloud66Agent.send(command, arguments)
 		end
-	rescue ArgumentError => exc
+	rescue ArgumentError
 		$logger.error "Invalid command/arguments: #{command} #{arguments}"
 		exit -1
 	end

data/lib/cloud66_agent/commands/job_end.rb

@@ -3,16 +3,15 @@ require 'cloud66_agent/utils/server'
 module Cloud66
 	module Commands
 		class JobEnd
-			def self.perform(status, job_uid, session_uid, execution_time, results_file)
-				job_results = File.exists?(results_file) ? IO.read(results_file) : ''
+			def self.perform(status, job_uid, session_uid, run_time, results_file)
+				job_results = File.exists?(results_file) ? IO.readlines(results_file) : []
 				data = {
 					status: status,
 					session_uid: session_uid,
-					execution_time: execution_time,
+					run_time: run_time,
 					job_results: job_results
 				}
 				Utils::Server.send_job_end(job_uid, data)
-				exit 0
 			rescue => exc
 				$logger.error "'job_end' failed: #{exc.message}"
 				exit -1

data/lib/cloud66_agent/utils/server.rb

@@ -45,7 +45,7 @@ module Cloud66
 						if parsed_response['shut_down']
 							$config.disabled = true
 							$config.save
-							exit -1
+							exit 86
 						elsif parsed_response.has_key?('error')
 							raise parsed_response['error']
 						else

data/lib/cloud66_agent/utils/version.rb

@@ -16,7 +16,7 @@ module Cloud66
 			MAJOR, MINOR, PATCH = 0, 0, 1
 
 			#ie. PRERELEASE_MODIFIER = 'beta1'
-			PRERELEASE_MODIFIER = "pre5"
+			PRERELEASE_MODIFIER = "pre6"
 
 			##
 			# Returns the major version ( big release based off of multiple minor releases )

data/lib/cloud66_agent.rb

@@ -28,9 +28,9 @@ class Cloud66Agent
 		status = args[0]
 		job_uid = args[1]
 		session_uid = args[2]
-		execution_time = args[3]
+		run_time = args[3]
 		results_file = args[4]
-		raise ArgumentError.new if status.nil? || job_uid.nil? || session_uid.nil? || execution_time.nil? || results_file.nil?
-		Cloud66::Commands::JobEnd.perform(status, job_uid, session_uid, execution_time, results_file)
+		raise ArgumentError.new if status.nil? || job_uid.nil? || session_uid.nil? || run_time.nil? || results_file.nil?
+		Cloud66::Commands::JobEnd.perform(status, job_uid, session_uid, run_time, results_file)
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud66_agent
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre5
+  version: 0.0.1.pre6
   prerelease: 6
 platform: ruby
 authors: