gilmour 0.4.6 → 0.4.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/gilmour/responder.rb +18 -8
  3. data/version.rb +1 -1
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 236cf81c410f0341b087c031b084e427b883fad9
4
- data.tar.gz: 849b47c624bd059591e4798c9d9697b65eda6c26
3
+ metadata.gz: e4e9eadabd238754db67f8e65d843b2562dd5175
4
+ data.tar.gz: 58c8c1a647f239f40a65a5bbc0ed8d57302a34df
5
5
  SHA512:
6
- metadata.gz: 65c9c78abd90975ed6152722e90f52cb317cee696f879ecea79996192e787911846dc59dc947d955e51c9150d28ffb2f5c2bb28522835bf4ac77b252d9fff896
7
- data.tar.gz: 08485b6558d170f58a0a04640129660502490dcd5870c14b6b576706f189df5afa4a8be24cad3a6afdb4742c8b3c825d02e409b5779548956237e2b7c07a486b
6
+ metadata.gz: 1d4a2cf6025931a841c38881ca894301dd8993d9c6fc95487bd76a2752b16c4537233bb8fd1cb1e06faa3ed7997b52f89f4eba3c9ade83eb568f549cbf84ecb3
7
+ data.tar.gz: a5a84cecac539ce97adfbdcc5d828d39e6467970680cfa6a454265bcb756822a8c9f7faaa59d807f66057d8ba26a0409c711c58145e5b9816713d9170d868437
@@ -36,10 +36,14 @@ module Gilmour
36
36
  loglevel = ENV["LOG_LEVEL"] ? ENV["LOG_LEVEL"].to_sym : :warn
37
37
  logger.level = Gilmour::LoggerLevels[loglevel] || Logger::WARN
38
38
  logger.formatter = proc do |severity, datetime, progname, msg|
39
- data = JSON.generate(severity: severity, msg: msg)
40
- # data = "#{LOG_PREFIX}#{severity}#{LOG_SEPERATOR}#{msg}"
41
- writer.write(data+"\n")
42
- writer.flush
39
+ begin
40
+ data = JSON.generate(severity: severity, msg: msg)
41
+ # data = "#{LOG_PREFIX}#{severity}#{LOG_SEPERATOR}#{msg}"
42
+ writer.write(data+"\n")
43
+ writer.flush
44
+ rescue
45
+ GLogger.error "Logger error: #{severity}: #{msg}"
46
+ end
43
47
  nil
44
48
  end
45
49
  logger
@@ -64,9 +68,9 @@ module Gilmour
64
68
  @timeout = opts[:timeout] || 600
65
69
  @multi_process = opts[:fork] || false
66
70
  @respond = opts[:respond]
67
- @response_pipe = IO.pipe
68
- @logger_pipe = IO.pipe
69
- @command_pipe = IO.pipe
71
+ @response_pipe = IO.pipe("UTF-8")
72
+ @logger_pipe = IO.pipe("UTF-8")
73
+ @command_pipe = IO.pipe("UTF-8")
70
74
  @logger = make_logger()
71
75
  @delayed_response = false
72
76
  end
@@ -75,6 +79,9 @@ module Gilmour
75
79
  sender, res_data, res_code, opts = JSON.parse(data)
76
80
  res_code ||= 200 if @respond
77
81
  write_response(sender, res_data, res_code) if sender && res_code
82
+ rescue => e
83
+ GLogger.error e.message
84
+ GLogger.error e.backtrace
78
85
  end
79
86
 
80
87
  # Called by parent
@@ -84,6 +91,9 @@ module Gilmour
84
91
  emit_error data, code
85
92
  end
86
93
  @backend.send_response(sender, data, code)
94
+ rescue => e
95
+ GLogger.error e.message
96
+ GLogger.error e.backtrace
87
97
  end
88
98
 
89
99
  # proxy to base add_listener
@@ -200,7 +210,7 @@ module Gilmour
200
210
  # Create pipes for child communication
201
211
  @read_pipe, @write_pipe = @response_pipe
202
212
  @read_command_pipe, @write_command_pipe = @command_pipe
203
- @read_logger_pipe, @write_logger_pipe = @logger_pipe = IO.pipe
213
+ @read_logger_pipe, @write_logger_pipe = @logger_pipe = IO.pipe("UTF-8")
204
214
 
205
215
  # setup relay threads
206
216
  wg = Gilmour::Waiter.new
data/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Gilmour
2
- VERSION = '0.4.6'
2
+ VERSION = '0.4.7'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gilmour
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.6
4
+ version: 0.4.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Aditya Godbole
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-08-27 00:00:00.000000000 Z
12
+ date: 2015-08-31 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rspec