jackal-cfn 0.2.24 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 169f3e4aaad15c0e3d62ac9bfc2d41df687cb25b
-  data.tar.gz: a2fd2b4845e5e24d1c219357f7dfafb02c407687
+  metadata.gz: 4e0eb97177871e4d5e59799e6dcd6348e3f37f82
+  data.tar.gz: b965abfa8ca1b3a6bfda081d8db644d8591699d4
 SHA512:
-  metadata.gz: 7c82910d725fd82db1f7d8beaed2dcaa7edcdf0d739f2b4b63782397d16123ea327c8a9b16d939e5e7a0fef6b5b584fd190be2bf71a9de533930715ce9112b36
-  data.tar.gz: 97ee96231e828993227a40bbbf66d072b3d158a25d690efb43e0cc4683aa94cd54275dc74d0721c6d1c3bd1c398fe34f435891577ee2cee2f17be673b5f4948d
+  metadata.gz: 1dddef4c1cca5592238e40fcc0a31bbcf95d1ff6a43ad1da9542306017c91983bc6f21d82666f83bc421bdf64bcf5f0f790cda7d09446501575f42e03ec6cede
+  data.tar.gz: 02f44b55eb33008fc49d28166ccc083db25b94858dc9981c3ebaba96c12205095d6d3eb0880aefb658e3377ef507e0700f18f381b1552644e03a6e9aeee7b6e5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.2.26
+* [fix] Update readpartial usage in OrchestrationUnit
+* [enhancement] Add debug output to OrchestrationUnit execution
+
 # v0.2.24
 * [fix] Account for pre-unpacked body in payload
 

data/lib/jackal-cfn/resource/orchestration_unit.rb

@@ -106,19 +106,23 @@ module Jackal
       # @return [Hash] CFN response
       def run_unit(unit, working_directory, response)
         if(unit[:exec_zip])
+          debug "Unit provided is compressed zip: #{unit[:exec_zip]}"
           fetch_and_unpack_exec(unit, working_directory)
         end
         if(unit[:exec])
+          debug "Unit to execute: #{unit[:exec]}"
           result = Smash.new
           stdout = process_manager.create_io_tmp(Carnivore.uuid, 'stdout')
           stderr = process_manager.create_io_tmp(Carnivore.uuid, 'stderr')
           result[:start_time] = Time.now.to_i
           [unit[:exec]].flatten.each do |exec_command|
+            debug "Command to execute: #{exec_command}"
             process_manager.process(unit.hash, exec_command) do |process|
               process.io.stdout = stdout
               process.io.stderr = stderr
               process.cwd = working_directory
               if(unit[:env])
+                debug "Custom environment defined: #{unit[:env]}"
                 process.environment.replace(unit[:env])
               end
               process.leader = true
@@ -127,6 +131,7 @@ module Jackal
                 process.poll_for_exit(config.fetch(:max_execution_time, 60))
                 result[:exit_code] = process.exit_code
                 break if result[:exit_code] != 0
+                debug "Execution of command successful - #{exec_command}"
               rescue ChildProcess::TimeoutError
                 process.stop
                 result[:timed_out] = true
@@ -139,10 +144,15 @@ module Jackal
           if(stdout.size > MAX_RESULT_SIZE)
             warn "Command result greater than allowed size: #{stdout.size} > #{MAX_RESULT_SIZE}"
           end
-          result[:content] = stdout.readpartial(0, MAX_RESULT_SIZE)
+          result[:content] = stdout.readpartial(MAX_RESULT_SIZE)
           if(result[:exit_code] != 0)
+            debug "Execution of unit failed - #{unit}"
             stderr.rewind
-            result[:error_message] = stderr.readpartial(0, MAX_RESULT_SIZE)
+            result[:error_message] = stderr.readpartial(MAX_RESULT_SIZE)
+            stderr.rewind
+            stdout.rewind
+            debug "Failed unit STDOUT: #{stdout.read}"
+            debug "Failed unit STDERR: #{stderr.read}"
           end
           if(result[:exit_code] == 0)
             response['Data']['OrchestrationUnitResult'] = result[:content]

data/lib/jackal-cfn/version.rb

@@ -1,6 +1,6 @@
 module Jackal
   module Cfn
     # Current version
-    VERSION = Gem::Version.new('0.2.24')
+    VERSION = Gem::Version.new('0.2.26')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jackal-cfn
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.2.26
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jackal