fluent-logger 0.7.1 → 0.9.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 138aa1f6b2e893e052fa4aab33e38ffe50a001da
4
- data.tar.gz: d6fb45180e4d79317df370ffd14ef8acb659ffab
2
+ SHA256:
3
+ metadata.gz: 00161d7e89f54b0c1627bb5b0ce36a7689405b84da319db5c4052e585c09f6a7
4
+ data.tar.gz: fc7229efbe7fb40412fe22080aa974156f49f7d5e4257c0071d82eb7359cca72
5
5
  SHA512:
6
- metadata.gz: 4b402b52625c8f1676eaece98d86e5aad61fda1d05c0623f926caf9074afdf589efca44851aefdead592212addc4124874ea27903f3861b867ca7336f65f5f47
7
- data.tar.gz: 921a3538d1e758502cf9986d2857c5f41e676c5dc5af6a72c57ac08d29e4889c0dbc9e786ef0d855230a29a965efcc0654c1c7e85da0fcbfa71d847c9ab76124
6
+ metadata.gz: 1066053b93cf4173b29e063659d7f80bb42b77a116b85b2a18f3d43cf19c54538359336b4b120d0ff43b65cc58110ae8a3357a52f417a0379ea09c306e27b808
7
+ data.tar.gz: 8c7839a41b615ccf34ebcd656c1719ba99245c39abe9981969b8cb7d1a9cf57ad972dfb8276ebffe4c8c132d95d2a1dfc1db5b354bfc720b4a7c569722688a33
@@ -1,15 +1,12 @@
1
1
  rvm:
2
- - 1.9.3
3
- - 2.0.0
4
- - 2.1
5
- - 2.2
6
- - 2.3.1
7
- - 2.4.0
2
+ - 2.4.10
3
+ - 2.5
4
+ - 2.6
5
+ - 2.7
8
6
  - ruby-head
9
7
 
10
8
  gemfile:
11
9
  - Gemfile
12
- - Gemfile.v0.12
13
10
 
14
11
  before_install: gem update bundler
15
12
  script: bundle exec rake spec
@@ -19,16 +16,3 @@ sudo: false
19
16
  matrix:
20
17
  allow_failures:
21
18
  - rvm: ruby-head
22
- exclude:
23
- - rvm: 1.9.3
24
- gemfile: Gemfile
25
- - rvm: 2.0.0
26
- gemfile: Gemfile
27
- - rvm: 2.2
28
- gemfile: Gemfile.v0.12
29
- - rvm: 2.3.1
30
- gemfile: Gemfile.v0.12
31
- - rvm: 2.4.0
32
- gemfile: Gemfile.v0.12
33
- - rvm: ruby-head
34
- gemfile: Gemfile.v0.12
data/ChangeLog CHANGED
@@ -1,3 +1,24 @@
1
+ Release 0.9.0 - 2020/09/04
2
+
3
+ * FluentLogger supports TLS
4
+
5
+ Release 0.8.2 - 2019/08/21
6
+
7
+ * Block timeout during IO#write to avoid writing invalid bytes
8
+ * Fluent::Logger::EventTime#to_json returns String
9
+
10
+ Release 0.8.1 - 2019/05/30
11
+
12
+ * Improve non-blocking write handling
13
+
14
+ Release 0.8.0 - 2019/01/25
15
+
16
+ * Add use_nonblock and wait_writeable parameters
17
+
18
+ Release 0.7.2 - 2018/01/04
19
+
20
+ * Fix EventTime for nanosecond_precision
21
+
1
22
  Release 0.7.1 - 2017/04/19
2
23
 
3
24
  * Fix packer clear bug for non-msgpackable data
@@ -122,4 +143,3 @@ Release 0.2.0 - 2011/08/05
122
143
  Release 0.1.0 - 2011/08/04
123
144
 
124
145
  * First release
125
-
data/README.md CHANGED
@@ -4,6 +4,22 @@
4
4
 
5
5
  A structured event logger
6
6
 
7
+ ## Installation
8
+
9
+ Add this line to your application's Gemfile:
10
+
11
+ ```ruby
12
+ gem 'fluent-logger'
13
+ ```
14
+
15
+ And then execute:
16
+
17
+ $ bundle install
18
+
19
+ Or install it yourself as:
20
+
21
+ $ gem install fluent-logger
22
+
7
23
  ## Examples
8
24
 
9
25
  ### Simple
@@ -11,6 +27,7 @@ A structured event logger
11
27
  ```ruby
12
28
  require 'fluent-logger'
13
29
 
30
+ # API: FluentLogger.new(tag_prefix, options)
14
31
  log = Fluent::Logger::FluentLogger.new(nil, :host => 'localhost', :port => 24224)
15
32
  unless log.post("myapp.access", {"agent" => "foo"})
16
33
  p log.last_error # You can get last error object via last_error method
@@ -26,32 +43,128 @@ require 'fluent-logger'
26
43
 
27
44
  log = Fluent::Logger::FluentLogger.new(nil, :socket_path => "/tmp/fluent.sock")
28
45
  unless log.post("myapp.access", {"agent" => "foo"})
46
+ # Passed records are stored into logger's internal buffer so don't re-post same event.
29
47
  p log.last_error # You can get last error object via last_error method
30
48
  end
31
49
 
32
50
  # output: myapp.access {"agent":"foo"}
33
51
  ```
34
52
 
35
- ### Singleton
53
+ ### Tag prefix
36
54
  ```ruby
37
55
  require 'fluent-logger'
38
56
 
39
- Fluent::Logger::FluentLogger.open(nil, :host => 'localhost', :port => 24224)
40
- Fluent::Logger.post("myapp.access", {"agent" => "foo"})
57
+ log = Fluent::Logger::FluentLogger.new('myapp', :host => 'localhost', :port => 24224)
58
+ log.post("access", {"agent" => "foo"})
41
59
 
42
60
  # output: myapp.access {"agent":"foo"}
43
61
  ```
44
62
 
45
- ### Tag prefix
63
+ ### Nonblocking write
64
+
46
65
  ```ruby
47
66
  require 'fluent-logger'
48
67
 
49
- log = Fluent::Logger::FluentLogger.new('myapp', :host => 'localhost', :port => 24224)
50
- log.post("access", {"agent" => "foo"})
68
+ log = Fluent::Logger::FluentLogger.new(nil, :host => 'localhost', :port => 24224, :use_nonblock => true, :wait_writeable => false)
69
+ # When wait_writeable is false
70
+ begin
71
+ log.post("myapp.access", {"agent" => "foo"})
72
+ rescue IO::EAGAINWaitWritable => e
73
+ # wait code for avoding "Resource temporarily unavailable"
74
+ # Passed records are stored into logger's internal buffer so don't re-post same event.
75
+ end
76
+
77
+ # When wait_writeable is true
78
+ unless log.post("myapp.access", {"agent" => "foo"})
79
+ # same as other example
80
+ end
51
81
 
52
82
  # output: myapp.access {"agent":"foo"}
53
83
  ```
54
84
 
85
+ ### TLS setting
86
+
87
+ ```ruby
88
+ require 'fluent-logger'
89
+
90
+ tls_opts = {
91
+ :ca => '/path/to/cacert.pem',
92
+ :cert => '/path/to/client-cert.pem',
93
+ :key => '/path/to/client-key.pem',
94
+ :key_passphrase => 'test'
95
+ }
96
+ log = Fluent::Logger::FluentLogger.new(nil, :host => 'localhost', :port => 24224, :tls_options => tls_opts)
97
+ ```
98
+
99
+ `in_forward` config example:
100
+
101
+ ```
102
+ <source>
103
+ @type forward
104
+ <transport tcp>
105
+ version TLS1_2
106
+ ca_path /path/to/cacert.pem
107
+ cert_path /path/to/server-cert.pem
108
+ private_key_path /path/to/server-key.pem
109
+ private_key_passphrase test
110
+ client_cert_auth true
111
+ </transport>
112
+ </source>
113
+ ```
114
+
115
+ ### Singleton
116
+ ```ruby
117
+ require 'fluent-logger'
118
+
119
+ Fluent::Logger::FluentLogger.open(nil, :host => 'localhost', :port => 24224)
120
+ Fluent::Logger.post("myapp.access", {"agent" => "foo"})
121
+
122
+ # output: myapp.access {"agent":"foo"}
123
+ ```
124
+
125
+ ### Logger options
126
+
127
+ #### host (String)
128
+
129
+ fluentd instance host
130
+
131
+ #### port (Integer)
132
+
133
+ fluentd instance port
134
+
135
+ #### socket_path (String)
136
+
137
+ If specified, fluentd uses unix domain socket instead of TCP.
138
+
139
+ #### nanosecond_precision (Bool)
140
+
141
+ Use nano second event time instead of epoch. See also "Tips" section.
142
+
143
+ #### use_nonblock (Bool)
144
+
145
+ Use nonblocking write(`IO#write_nonblock`) instead of normal write(`IO#write`). If `Logger#post` stuck on your environment, specify `true`. Default: `false`
146
+
147
+ #### wait_writeable (Bool)
148
+
149
+ If `false`, `Logger#post` raises an error when nonblocking write gets `EAGAIN` (i.e. `use_nonblock` must be `true`, otherwise this will have no effect). Default: `true`
150
+
151
+ #### buffer_overflow_handler (Proc)
152
+
153
+ Pass callback for handling buffer overflow with pending data. See "Buffer overflow" section.
154
+
155
+ #### tls_options (Hash)
156
+
157
+ Pass TLS related options.
158
+
159
+ - use_default_ca: Set `true` if you want to use default CA
160
+ - ca: CA file path
161
+ - cert: Certificate file path
162
+ - key: Private key file path
163
+ - key_passphrase: Private key passphrase
164
+ - version: TLS version. Default is `OpenSSL::SSL::TLS1_2_VERSION`
165
+ - ciphers: The list of cipher suites. Default is `ALL:!aNULL:!eNULL:!SSLv2`
166
+ - insecure: Set `true` when `in_forward` uses `insecure true`
167
+
55
168
  ### Standard ::Logger compatible interface
56
169
 
57
170
  #### Example1
@@ -1,20 +1,10 @@
1
1
  # encoding: utf-8
2
2
  $:.push File.expand_path('../lib', __FILE__)
3
+ require 'fluent/logger/version'
3
4
 
4
5
  Gem::Specification.new do |gem|
5
6
  version_file = "lib/fluent/logger/version.rb"
6
- version = File.read("VERSION").strip
7
- File.open(version_file, "w") {|f|
8
- f.write <<EOF
9
- module Fluent
10
- module Logger
11
-
12
- VERSION = '#{version}'
13
-
14
- end
15
- end
16
- EOF
17
- }
7
+ version = Fluent::Logger::VERSION
18
8
 
19
9
  gem.name = %q{fluent-logger}
20
10
  gem.version = version
@@ -29,6 +19,7 @@ EOF
29
19
  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
30
20
  gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
31
21
  gem.require_paths = ['lib']
22
+ gem.license = "Apache-2.0"
32
23
 
33
24
  gem.add_dependency "msgpack", ">= 1.0.0", "< 2"
34
25
  gem.add_development_dependency 'rake', '>= 0.9.2'
@@ -15,8 +15,10 @@
15
15
  # See the License for the specific language governing permissions and
16
16
  # limitations under the License.
17
17
  #
18
+ require 'timeout'
18
19
  require 'msgpack'
19
20
  require 'socket'
21
+ require 'openssl'
20
22
  require 'monitor'
21
23
  require 'logger'
22
24
  require 'json'
@@ -26,16 +28,17 @@ module Fluent
26
28
  class EventTime
27
29
  TYPE = 0
28
30
 
29
- def initialize(raw_time)
30
- @time = raw_time
31
+ def initialize(sec, nsec = 0)
32
+ @sec = sec
33
+ @nsec = nsec
31
34
  end
32
35
 
33
36
  def to_msgpack(io = nil)
34
- @time.to_i.to_msgpack(io)
37
+ @sec.to_msgpack(io)
35
38
  end
36
39
 
37
40
  def to_msgpack_ext
38
- [@time.to_i, @time.nsec].pack('NN')
41
+ [@sec, @nsec].pack('NN')
39
42
  end
40
43
 
41
44
  def self.from_msgpack_ext(data)
@@ -43,7 +46,7 @@ module Fluent
43
46
  end
44
47
 
45
48
  def to_json(*args)
46
- @time.to_i
49
+ @sec.to_s
47
50
  end
48
51
  end
49
52
 
@@ -63,7 +66,8 @@ module Fluent
63
66
 
64
67
  options = {
65
68
  :host => 'localhost',
66
- :port => 24224
69
+ :port => 24224,
70
+ :use_nonblock => false
67
71
  }
68
72
 
69
73
  case args.first
@@ -80,6 +84,8 @@ module Fluent
80
84
  @port = options[:port]
81
85
  @socket_path = options[:socket_path]
82
86
  @nanosecond_precision = options[:nanosecond_precision]
87
+ @use_nonblock = options[:use_nonblock]
88
+ @tls_options = options[:tls_options]
83
89
 
84
90
  @factory = MessagePack::Factory.new
85
91
  if @nanosecond_precision
@@ -95,8 +101,8 @@ module Fluent
95
101
  @log_reconnect_error_threshold = options[:log_reconnect_error_threshold] || RECONNECT_WAIT_MAX_COUNT
96
102
 
97
103
  @buffer_overflow_handler = options[:buffer_overflow_handler]
98
- if logger = options[:logger]
99
- @logger = logger
104
+ if options[:logger]
105
+ @logger = options[:logger]
100
106
  else
101
107
  @logger = ::Logger.new(STDERR)
102
108
  if options[:debug]
@@ -106,6 +112,9 @@ module Fluent
106
112
  end
107
113
  end
108
114
 
115
+ @wait_writeable = true
116
+ @wait_writeable = options[:wait_writeable] if options.key?(:wait_writeable)
117
+
109
118
  @last_error = {}
110
119
 
111
120
  begin
@@ -120,7 +129,6 @@ module Fluent
120
129
  end
121
130
 
122
131
  attr_accessor :limit, :logger, :log_reconnect_error_threshold
123
- attr_reader :last_error
124
132
 
125
133
  def last_error
126
134
  @last_error[Thread.current.object_id]
@@ -130,7 +138,7 @@ module Fluent
130
138
  @logger.debug { "event: #{tag} #{map.to_json}" rescue nil } if @logger.debug?
131
139
  tag = "#{@tag_prefix}.#{tag}" if @tag_prefix
132
140
  if @nanosecond_precision && time.is_a?(Time)
133
- write [tag, EventTime.new(time), map]
141
+ write [tag, EventTime.new(time.to_i, time.nsec), map]
134
142
  else
135
143
  write [tag, time.to_i, map]
136
144
  end
@@ -163,6 +171,33 @@ module Fluent
163
171
  @con = UNIXSocket.new(@socket_path)
164
172
  else
165
173
  @con = TCPSocket.new(@host, @port)
174
+ if @tls_options
175
+ context = OpenSSL::SSL::SSLContext.new
176
+ if @tls_options[:insecure]
177
+ context.verify_mode = OpenSSL::SSL::VERIFY_NONE
178
+ else
179
+ context.set_params({})
180
+ context.verify_mode = OpenSSL::SSL::VERIFY_PEER
181
+ cert_store = OpenSSL::X509::Store.new
182
+ if @tls_options[:use_default_ca]
183
+ cert_store.set_default_paths
184
+ end
185
+ if @tls_options[:ca]
186
+ cert_store.add_file(@tls_options[:ca])
187
+ end
188
+
189
+ context.cert = OpenSSL::X509::Certificate.new(File.read(@tls_options[:cert])) if @tls_options[:cert]
190
+ context.key = OpenSSL::PKey::read(File.read(@tls_options[:key]), @tls_options[:key_passphrase]) if @tls_options[:key]
191
+ context.ciphers = @tls_options[:ciphers] || "ALL:!aNULL:!eNULL:!SSLv2".freeze
192
+ context.cert_store = cert_store
193
+ end
194
+ set_tls_version(context)
195
+
196
+ @con = OpenSSL::SSL::SSLSocket.new(@con, context)
197
+ @con.sync_close = true
198
+ @con.connect
199
+ end
200
+ @con
166
201
  end
167
202
  end
168
203
 
@@ -180,6 +215,16 @@ module Fluent
180
215
 
181
216
  private
182
217
 
218
+ def set_tls_version(context)
219
+ if context.respond_to?(:min_version=)
220
+ ver = @tls_options[:version] || OpenSSL::SSL::TLS1_2_VERSION
221
+ context.min_version = ver
222
+ context.max_version = ver
223
+ else
224
+ context.ssl_version = @tls_options[:version] || :'TLSv1_2'
225
+ end
226
+ end
227
+
183
228
  def to_msgpack(msg)
184
229
  @mon.synchronize {
185
230
  res = begin
@@ -224,10 +269,17 @@ module Fluent
224
269
  end
225
270
 
226
271
  begin
227
- send_data(@pending)
272
+ written = send_data(@pending)
273
+ if @pending.bytesize != written
274
+ raise "Actual written data size(#{written} bytes) is different from the received data size(#{@pending.bytesize} bytes)."
275
+ end
276
+
228
277
  @pending = nil
229
278
  true
230
279
  rescue => e
280
+ unless wait_writeable?(e)
281
+ raise e
282
+ end
231
283
  set_last_error(e)
232
284
  if pending_bytesize > @limit
233
285
  @logger.error("FluentLogger: Can't send logs to #{connection_string}: #{$!}")
@@ -245,7 +297,15 @@ module Fluent
245
297
  unless connect?
246
298
  connect!
247
299
  end
248
- @con.write data
300
+ if @use_nonblock
301
+ send_data_nonblock(data)
302
+ else
303
+ _, ws = IO.select([], [@con])
304
+ Thread.handle_interrupt(::Timeout::Error => :never) do
305
+ # block timeout error during IO#write
306
+ ws.first.write(data)
307
+ end
308
+ end
249
309
  #while true
250
310
  # puts "sending #{data.length} bytes"
251
311
  # if data.length > 32*1024
@@ -259,7 +319,19 @@ module Fluent
259
319
  # end
260
320
  # data = data[n..-1]
261
321
  #end
262
- true
322
+ end
323
+
324
+ def send_data_nonblock(data)
325
+ written = @con.write_nonblock(data)
326
+ remaining = data.bytesize - written
327
+
328
+ while remaining > 0
329
+ len = @con.write_nonblock(data.byteslice(written, remaining))
330
+ remaining -= len
331
+ written += len
332
+ end
333
+
334
+ written
263
335
  end
264
336
 
265
337
  def connect!
@@ -297,6 +369,14 @@ module Fluent
297
369
  # TODO: Check non GVL env
298
370
  @last_error[Thread.current.object_id] = e
299
371
  end
372
+
373
+ def wait_writeable?(e)
374
+ if e.instance_of?(IO::EAGAINWaitWritable)
375
+ @wait_writeable
376
+ else
377
+ true
378
+ end
379
+ end
300
380
  end
301
381
  end
302
382
  end
@@ -1,7 +1,5 @@
1
1
  module Fluent
2
- module Logger
3
-
4
- VERSION = '0.7.1'
5
-
6
- end
2
+ module Logger
3
+ VERSION = '0.9.0'
4
+ end
7
5
  end
@@ -58,6 +58,57 @@ describe Fluent::Logger::FluentLogger do
58
58
  @serverengine.shutdown
59
59
  end
60
60
 
61
+ describe('testing interaction of use_nonblock and wait_writeable') do
62
+ before(:example) do
63
+ allow_any_instance_of(TCPSocket).to receive(:write_nonblock).and_raise(IO::EAGAINWaitWritable)
64
+ allow_any_instance_of(TCPSocket).to receive(:write) { |_, buf| buf.size }
65
+ end
66
+
67
+ context('use_nonblock is false') do
68
+ let(:block_config) { logger_config.merge(use_nonblock: false) }
69
+
70
+ it('post returns true when wait_writeable is false') {
71
+ cfg = block_config.merge(wait_writeable: false)
72
+ l = Fluent::Logger::FluentLogger.new('logger-test', cfg)
73
+ expect(l.post('hello', foo: 'bar')).to eq true
74
+ }
75
+
76
+ it('post returns true when wait_writeable is true') {
77
+ cfg = block_config.merge(wait_writeable: true)
78
+ l = Fluent::Logger::FluentLogger.new('logger-test', cfg)
79
+ expect(l.post('hello', {foo: 'bar'})).to eq true
80
+ }
81
+ end
82
+
83
+ context('use_nonblock is true') do
84
+ let(:nonblock_config) { logger_config.merge(use_nonblock: true) }
85
+
86
+ it('post raises IO::EAGAINWaitWritable when wait_writeable is false') {
87
+ cfg = nonblock_config.merge(wait_writeable: false)
88
+ l = Fluent::Logger::FluentLogger.new('logger-test', cfg)
89
+ expect { l.post('hello', foo: 'bar') }.to raise_error(IO::EAGAINWaitWritable)
90
+ }
91
+
92
+ it('post returns false when wait_writeable is true') {
93
+ cfg = nonblock_config.merge(wait_writeable: true)
94
+ l = Fluent::Logger::FluentLogger.new('logger-test', cfg)
95
+ expect(l.post('hello', {foo: 'bar'})).to eq false
96
+ }
97
+
98
+ context 'when write_nonblock returns the size less than received data' do
99
+ before do
100
+ allow_any_instance_of(TCPSocket).to receive(:write_nonblock).and_return(1) # write 1 bytes per call
101
+ end
102
+
103
+ it 'buffering data and flush at closed time' do
104
+ logger = Fluent::Logger::FluentLogger.new('logger-test', nonblock_config)
105
+ expect(logger.post('hello', foo: 'bar')).to eq(true)
106
+ expect(logger.pending_bytesize).to eq(0)
107
+ end
108
+ end
109
+ end
110
+ end
111
+
61
112
  context('Post by CUI') do
62
113
  it('post') {
63
114
  args = %W(-h localhost -p #{fluentd.port} -t logger-test.tag -v a=b -v foo=bar)
@@ -86,6 +137,16 @@ describe Fluent::Logger::FluentLogger do
86
137
  }
87
138
  end
88
139
 
140
+ context 'when the message has object which does not have #to_msgpack method' do
141
+ it 'success with nanosecond' do
142
+ expect(logger_with_nanosec.pending_bytesize).to eq(0)
143
+ expect(logger_with_nanosec.post('tag', 'a' => Errno::ETIMEDOUT)).to eq(true)
144
+ fluentd.wait_transfer
145
+ expect(fluentd.queue.last).to eq(['logger-test.tag', { 'a' => 'Errno::ETIMEDOUT' }])
146
+ expect(logger_with_nanosec.pending_bytesize).to eq(0)
147
+ end
148
+ end
149
+
89
150
  it ('close after post') {
90
151
  expect(logger).to be_connect
91
152
  logger.close
@@ -312,4 +373,51 @@ describe Fluent::Logger::FluentLogger do
312
373
  end
313
374
  end
314
375
  end
376
+
377
+ context "running fluentd with TLS" do
378
+ before(:all) do
379
+ @serverengine = DummyServerengine.new
380
+ @serverengine.startup
381
+ end
382
+
383
+ before(:each) do
384
+ fluentd.startup(true)
385
+ end
386
+
387
+ after(:each) do
388
+ fluentd.shutdown
389
+ end
390
+
391
+ after(:all) do
392
+ @serverengine.shutdown
393
+ end
394
+
395
+ let(:logger_config) {
396
+ {
397
+ :host => 'localhost',
398
+ :port => fluentd.port,
399
+ :logger => internal_logger,
400
+ :buffer_overflow_handler => buffer_overflow_handler,
401
+ :tls_options => {:insecure => true}
402
+ }
403
+ }
404
+
405
+ context('post') do
406
+ it ('success') {
407
+ expect(logger.pending_bytesize).to eq 0
408
+ expect(logger.post('tag', {'a' => 'b'})).to be true
409
+ fluentd.wait_transfer
410
+ expect(fluentd.queue.last).to eq ['logger-test.tag', {'a' => 'b'}]
411
+ expect(logger.pending_bytesize).to eq 0
412
+ }
413
+
414
+ it ('success with nanosecond') {
415
+ expect(logger_with_nanosec.pending_bytesize).to eq 0
416
+ expect(logger_with_nanosec.post('tag', {'a' => 'b'})).to be true
417
+ fluentd.wait_transfer
418
+ expect(fluentd.queue.last).to eq ['logger-test.tag', {'a' => 'b'}]
419
+ expect(fluentd.output.emits.first[1]).to be_a_kind_of(Fluent::EventTime)
420
+ }
421
+ end
422
+ end
315
423
  end
@@ -51,8 +51,22 @@ class DummyFluentd
51
51
  queue
52
52
  end
53
53
 
54
- def startup
55
- config = Fluent::Config.parse(<<EOF, '(logger-spec)', '(logger-spec-dir)', true)
54
+ def startup(with_tls = false)
55
+ if with_tls
56
+ config = Fluent::Config.parse(<<EOF, '(logger-spec)', '(logger-spec-dir)', true)
57
+ <source>
58
+ type forward
59
+ port #{port}
60
+ <transport tls>
61
+ insecure true
62
+ </transport>
63
+ </source>
64
+ <match logger-test.**>
65
+ type test
66
+ </match>
67
+ EOF
68
+ else
69
+ config = Fluent::Config.parse(<<EOF, '(logger-spec)', '(logger-spec-dir)', true)
56
70
  <source>
57
71
  type forward
58
72
  port #{port}
@@ -61,6 +75,8 @@ class DummyFluentd
61
75
  type test
62
76
  </match>
63
77
  EOF
78
+ end
79
+
64
80
  Fluent::Test.setup
65
81
  Fluent::Engine.run_configure(config)
66
82
  @coolio_default_loop = nil
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-logger
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.1
4
+ version: 0.9.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sadayuki Furuhashi
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-04-18 00:00:00.000000000 Z
11
+ date: 2020-09-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: msgpack
@@ -117,7 +117,6 @@ files:
117
117
  - Gemfile.v0.12
118
118
  - README.md
119
119
  - Rakefile
120
- - VERSION
121
120
  - bin/fluent-post
122
121
  - fluent-logger.gemspec
123
122
  - lib/fluent-logger.rb
@@ -144,7 +143,8 @@ files:
144
143
  - spec/support/timecop.rb
145
144
  - spec/test_logger_spec.rb
146
145
  homepage: https://github.com/fluent/fluent-logger-ruby
147
- licenses: []
146
+ licenses:
147
+ - Apache-2.0
148
148
  metadata: {}
149
149
  post_install_message:
150
150
  rdoc_options: []
@@ -161,8 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
161
161
  - !ruby/object:Gem::Version
162
162
  version: '0'
163
163
  requirements: []
164
- rubyforge_project:
165
- rubygems_version: 2.6.11
164
+ rubygems_version: 3.1.2
166
165
  signing_key:
167
166
  specification_version: 4
168
167
  summary: fluent logger for ruby
data/VERSION DELETED
@@ -1 +0,0 @@
1
- 0.7.1