maestro_plugin 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d24ae39f1edbe831c14c926e4b7a39ac11456da4
-  data.tar.gz: af8ca346b352b67a636adc1897568f99e8b75e1c
+  metadata.gz: e719015fbdabceaf74a2229bb76721c822f45346
+  data.tar.gz: c53a224127581e6ad1849888ca3cb4743b08f4f9
 SHA512:
-  metadata.gz: 72105b60a7dec153f3fc26742edb4fd55c5c72e875d46c3b81856d161e2254b8d29915bff59bb44a11786be9c801c7d103f40beda5dd183d493fe3d828c0f7b1
-  data.tar.gz: a1d4363f34af636d7cd8c46cace6b1f67e9e858c8f55805616d082f020330411624704c9cc57fbe1de0221e675f8c0869059f1bc746349758db2f0de01aac2ec
+  metadata.gz: 8b218bf2c4cd5055aaaa656531983d3c499e982d87b5f9569eae2775ba5264935a9fb119899345f88c195ddd0f05fd194803699040148faa52893a6a4d719c0a
+  data.tar.gz: 51686641189e11d6ba4209c1f1076c135f2d7ffa92180b3ba972535156ab108a82de59578f0958a431ac2cffe197eb850c4f5c875b1837fc97be54a33f4f7ca7

data/lib/maestro_plugin/maestro_worker.rb

@@ -177,6 +177,38 @@ module Maestro
       #
       # The 2 second factor is there to allow slowly accumulating data to be sent out more regularly.
       if !@buffered_output.empty? && (!options[:buffer] || Time.now - @last_write_output > 2)
+        # Ensure the output is json-able.
+        # It seems some code doesn't wholly respect encoding rules.  We've found some http responses that
+        # don't have the correct encoding, despite the response headers stating 'utf-8', etc.  Same goes
+        # for shell output streams, that don't seem to respect the apps encoding.
+        # What this code does is to try to json encode the @buffered_output.  First a direct conversion,
+        # if that fails, try to force-encoding to utf-8, if that fails, try to remove all chars with
+        # code > 127.  If that fails - we gave it a good shot, and maybe just insert a 'redacted' string
+        # so at least the task doesn't fail :)
+        begin
+          @buffered_output.to_json
+        rescue Exception
+          begin
+            test = @buffered_output
+            test.force_encoding('UTF-8')
+            test.to_json
+            # If forcing encoding worked, updated buffered_output
+            Maestro.log.warn("Had to force encoding to utf-8 for workitem stream")
+            @buffered_output = test
+          rescue Exception
+            begin
+              test = @buffered_output.gsub(/[^\x00-\x7f]/, '?')
+              test.to_json
+              # If worked, updated buffered_output
+              Maestro.log.warn("Had to strip top-bit-set chars for workitem stream")
+              @buffered_output = test
+            rescue Exception
+              Maestro.log.warn("Had to redact block of output, unable to 'to_json' it for workitem stream")
+              @buffered_output = '?_?'
+            end
+          end
+        end
+
         if !MaestroWorker.mock?
           workitem[OUTPUT_META] = @buffered_output
         else

data/lib/maestro_plugin/version.rb

@@ -1,5 +1,5 @@
 module Maestro
   module Plugin
-    VERSION = '0.0.18'
+    VERSION = '0.0.19'
   end
 end

data/spec/maestro_worker_spec.rb

@@ -62,6 +62,21 @@ describe Maestro::MaestroWorker do
       subject.workitem['__streaming__'].should be_nil
     end
 
+    it 'should handle non utf-8 strings with funky characters (complete failure)' do
+      text = "\x8f"
+      text.force_encoding("US-ASCII")
+      subject.write_output(text)
+      subject.workitem['__output__'].should eql("?_?")
+    end
+
+    it 'should handle non utf-8 strings with funky characters (partial failure)' do
+      text = "missing \xc3\xa9"
+      text = text.force_encoding("ASCII-8BIT")
+      expect { text.to_json}.to raise_exception(Encoding::ConverterNotFoundError)
+      subject.write_output(text)
+      subject.workitem['__output__'].should eql("missing \u00E9")
+    end
+
     it 'should send a not needed message' do
       subject.not_needed
       subject.workitem['__not_needed__'].should be_nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestro_plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Etienne Pelletier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging