gilmour 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 762241aef84bf02c572d89ac9f22c16b710911dc
-  data.tar.gz: 50f90851b8bbe757576118d44480b4d102aa6d0e
+  metadata.gz: b164c237e9423f1bbcc3e91cf3dc94c376c7163e
+  data.tar.gz: 87aec87330f766c0e5428fa301637e077dc61a41
 SHA512:
-  metadata.gz: d91f45f9377ff883ff8c371c21212e2702323649c4d45d819bf405bbb570aa3ccd0dff4c401a85d5d59e6a745b2a2398f456947bdc83183c51dc99a0ed31e573
-  data.tar.gz: 8202e63ba3940829ccac7a89aeba02336f0b2f6b18001c73d3549da496a4576ddb54d01b6ded31472bc2af8891bab5d24b8512bed8dda696065b35c63a1a2b7c
+  metadata.gz: 9227f1a16c983556caaa99b9a712e3641d0f208f517eab8eba0fb3001f543146c57284ea8b1cda44982099ad69a40b54ddaa31069384b5c165a5ec5292c778ff
+  data.tar.gz: ec09fe7036f7829e1d5478b6f8ffcdd97216a09b94822b5c29bb5803af4f5f23b477f8bfea1d19da9f9ac5ee4b83dbe1478ea0373df2041a94c5c406e368029f

data/lib/gilmour/backends/redis.rb

@@ -41,6 +41,10 @@ module Gilmour
 
       @report_errors = opts["broadcast_errors"] || opts[:broadcast_errors]
       @report_errors = true if @report_errors != false
+
+      @capture_stdout = opts["capture_stdout"] || opts[:capture_stdout]
+      @capture_stdout = false if @capture_stdout != true
+
       @ident = generate_ident
     end
 
@@ -52,6 +56,10 @@ module Gilmour
       "#{Socket.gethostname}-pid-#{Process.pid}-uuid-#{SecureRandom.uuid}"
     end
 
+    def capture_stdout?
+      @capture_stdout
+    end
+
     def report_health?
       @report_health
     end

data/lib/gilmour/responder.rb

@@ -22,7 +22,6 @@ module Gilmour
   end
 
   class Responder
-    CAPTURE_STDOUT = false
     LOG_SEPERATOR = '%%'
     LOG_PREFIX = "#{LOG_SEPERATOR}gilmour#{LOG_SEPERATOR}"
 
@@ -60,6 +59,7 @@ module Gilmour
       @pipe = IO.pipe
       @publish_pipe = IO.pipe
       @logger = make_logger()
+      @capture_stdout = @backend.capture_stdout? || false
     end
 
     def receive_data(data)
@@ -184,7 +184,7 @@ module Gilmour
         parent_io = [out_r]
         child_io = [out_w]
 
-        if CAPTURE_STDOUT == true
+        if @capture_stdout == true
           err_r, err_w = IO.pipe
           child_io << err_w
           parent_io << err_r
@@ -202,7 +202,7 @@ module Gilmour
           @response_sent = false
           @logger = fork_logger
 
-          capture_output(child_io, CAPTURE_STDOUT) {
+          capture_output(child_io, @capture_stdout) {
             _execute(handler)
           }
         end

data/lib/gilmour/stdhijack.rb

@@ -18,10 +18,10 @@ def capture_output(pipes, capture_stdout=false)
   streams = []
 
   if capture_stdout == true
-    streams << $stdout
+    streams << STDOUT
   end
 
-  streams << $stderr
+  streams << STDERR
 
   # Save the streams to be reassigned later.
   # Actually it doesn't matter because the child process would be killed

data/test/spec/test_subscriber_redis_forked.rb

@@ -9,6 +9,7 @@ require_relative 'helpers/connection'
 describe 'TestSubscriberFork' do
   opts = redis_connection_options
   opts['health_check'] = false
+  opts['capture_stdout'] = true
 
   test_subscriber_path = './testservice/subscribers/test_subscriber'
   after(:all) do

data/version.rb

@@ -1,3 +1,3 @@
 module Gilmour
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gilmour
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Aditya Godbole
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec