fluentd 1.11.0-x86-mingw32 → 1.11.1-x86-mingw32
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of fluentd might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/CHANGELOG.md +19 -1
- data/lib/fluent/command/fluentd.rb +11 -0
- data/lib/fluent/plugin/in_http.rb +146 -75
- data/lib/fluent/plugin/in_tail.rb +2 -2
- data/lib/fluent/plugin_helper/child_process.rb +3 -2
- data/lib/fluent/version.rb +1 -1
- data/test/plugin/test_in_http.rb +57 -0
- data/test/plugin_helper/test_child_process.rb +15 -0
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c5c0bb8a881ac7bdbad86f9261310b8d3e7f505c3ec085594237a6f01b6bd2b3
|
4
|
+
data.tar.gz: 5436e5d40545b9c3131abd63eeb33a94663ea8c98bd492b3b1d1d92ddfd616c7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0ba7de652d79100f15bd5c921d233260fa8ce97d4c89dde51a2c4c1ea76bc8ef363e76a51bb179634e0d9e30edea0bbf2f80f4fe8cca0baea1e2d1c4964664f3
|
7
|
+
data.tar.gz: 7273f92710cab57e9368623641efcd31bcd9aced03db45eb5f9316466ffaae0209725800d35abc1c522428ebf7b4280a9a8a812793dfa1a2909ab2db74eb80a4
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,23 @@
|
|
1
1
|
# v1.11
|
2
2
|
|
3
|
+
## Release v1.11.1 - 2020/06/22
|
4
|
+
|
5
|
+
### Enhancement
|
6
|
+
|
7
|
+
* in_http: Add `dump_error_log` parameter
|
8
|
+
https://github.com/fluent/fluentd/pull/3035
|
9
|
+
* in_http: Improve time field handling
|
10
|
+
https://github.com/fluent/fluentd/pull/3046
|
11
|
+
* Refactoring code
|
12
|
+
https://github.com/fluent/fluentd/pull/3047
|
13
|
+
|
14
|
+
### Bug fix
|
15
|
+
|
16
|
+
* in_tail: Use actual path instead of based pattern for ignore list
|
17
|
+
https://github.com/fluent/fluentd/pull/3042
|
18
|
+
* child_process helper: Fix child process failure due to SIGPIPE if the command uses stdout
|
19
|
+
https://github.com/fluent/fluentd/pull/3044
|
20
|
+
|
3
21
|
## Release v1.11.0 - 2020/06/04
|
4
22
|
|
5
23
|
### New feature
|
@@ -10,7 +28,7 @@
|
|
10
28
|
### Enhancement
|
11
29
|
|
12
30
|
* parser_syslog: Support any `time_format` for RFC3164 string parser
|
13
|
-
https://github.com/fluent/fluentd/pull/
|
31
|
+
https://github.com/fluent/fluentd/pull/3014
|
14
32
|
* parser_syslog: Add new parser for RFC5424
|
15
33
|
https://github.com/fluent/fluentd/pull/3015
|
16
34
|
* Refactoring code
|
@@ -185,6 +185,10 @@ if Fluent.windows?
|
|
185
185
|
opts[:regwinsvcautostart] = s
|
186
186
|
}
|
187
187
|
|
188
|
+
op.on('--[no-]reg-winsvc-delay-start', "Automatically start the Windows Service at boot with delay. (only effective with '--reg-winsvc i' and '--reg-winsvc-auto-start') (Windows only)") {|s|
|
189
|
+
opts[:regwinsvcdelaystart] = s
|
190
|
+
}
|
191
|
+
|
188
192
|
op.on('--reg-winsvc-fluentdopt OPTION', "specify fluentd option parameters for Windows Service. (Windows only)") {|s|
|
189
193
|
opts[:fluentdopt] = s
|
190
194
|
}
|
@@ -285,6 +289,13 @@ if winsvcinstmode = opts[:regwinsvc]
|
|
285
289
|
dependencies: [""],
|
286
290
|
display_name: opts[:winsvc_display_name]
|
287
291
|
)
|
292
|
+
|
293
|
+
if opts[:regwinsvcdelaystart]
|
294
|
+
Service.configure(
|
295
|
+
service_name: opts[:winsvc_name],
|
296
|
+
delayed_start: true
|
297
|
+
)
|
298
|
+
end
|
288
299
|
when 'u'
|
289
300
|
if Service.status(opts[:winsvc_name]).current_state != 'stopped'
|
290
301
|
begin
|
@@ -27,10 +27,28 @@ require 'json'
|
|
27
27
|
module Fluent::Plugin
|
28
28
|
class InHttpParser < Parser
|
29
29
|
Fluent::Plugin.register_parser('in_http', self)
|
30
|
+
|
31
|
+
config_set_default :time_key, 'time'
|
32
|
+
|
33
|
+
def configure(conf)
|
34
|
+
super
|
35
|
+
|
36
|
+
# if no time parser related parameters, use in_http's time convert rule
|
37
|
+
@time_parser = if conf.has_key?('time_type') || conf.has_key?('time_format')
|
38
|
+
time_parser_create
|
39
|
+
else
|
40
|
+
nil
|
41
|
+
end
|
42
|
+
end
|
43
|
+
|
30
44
|
def parse(text)
|
31
45
|
# this plugin is dummy implementation not to raise error
|
32
46
|
yield nil, nil
|
33
47
|
end
|
48
|
+
|
49
|
+
def get_time_parser
|
50
|
+
@time_parser
|
51
|
+
end
|
34
52
|
end
|
35
53
|
|
36
54
|
class HttpInput < Input
|
@@ -60,6 +78,8 @@ module Fluent::Plugin
|
|
60
78
|
config_param :respond_with_empty_img, :bool, default: false
|
61
79
|
desc 'Respond status code with 204.'
|
62
80
|
config_param :use_204_response, :bool, default: false
|
81
|
+
desc 'Dump error log or not'
|
82
|
+
config_param :dump_error_log, :bool, default: true
|
63
83
|
|
64
84
|
config_section :parse do
|
65
85
|
config_set_default :@type, 'in_http'
|
@@ -67,6 +87,24 @@ module Fluent::Plugin
|
|
67
87
|
|
68
88
|
EVENT_RECORD_PARAMETER = '_event_record'
|
69
89
|
|
90
|
+
def initialize
|
91
|
+
super
|
92
|
+
|
93
|
+
@km = nil
|
94
|
+
@format_name = nil
|
95
|
+
@parser_time_key = nil
|
96
|
+
|
97
|
+
# default parsers
|
98
|
+
@parser_msgpack = nil
|
99
|
+
@parser_json = nil
|
100
|
+
@default_time_parser = nil
|
101
|
+
@default_keep_time_key = nil
|
102
|
+
@float_time_parser = nil
|
103
|
+
|
104
|
+
# <parse> configured parser
|
105
|
+
@custom_parser = nil
|
106
|
+
end
|
107
|
+
|
70
108
|
def configure(conf)
|
71
109
|
compat_parameters_convert(conf, :parser)
|
72
110
|
|
@@ -74,20 +112,22 @@ module Fluent::Plugin
|
|
74
112
|
|
75
113
|
m = if @parser_configs.first['@type'] == 'in_http'
|
76
114
|
@parser_msgpack = parser_create(usage: 'parser_in_http_msgpack', type: 'msgpack')
|
115
|
+
@parser_msgpack.time_key = nil
|
77
116
|
@parser_msgpack.estimate_current_event = false
|
78
117
|
@parser_json = parser_create(usage: 'parser_in_http_json', type: 'json')
|
118
|
+
@parser_json.time_key = nil
|
79
119
|
@parser_json.estimate_current_event = false
|
120
|
+
|
121
|
+
default_parser = parser_create(usage: '')
|
80
122
|
@format_name = 'default'
|
81
|
-
@parser_time_key =
|
82
|
-
|
83
|
-
|
84
|
-
'time'
|
85
|
-
end
|
123
|
+
@parser_time_key = default_parser.time_key
|
124
|
+
@default_time_parser = default_parser.get_time_parser
|
125
|
+
@default_keep_time_key = default_parser.keep_time_key
|
86
126
|
method(:parse_params_default)
|
87
127
|
else
|
88
|
-
@
|
128
|
+
@custom_parser = parser_create
|
89
129
|
@format_name = @parser_configs.first['@type']
|
90
|
-
@parser_time_key = @
|
130
|
+
@parser_time_key = @custom_parser.time_key
|
91
131
|
method(:parse_params_with_parser)
|
92
132
|
end
|
93
133
|
self.singleton_class.module_eval do
|
@@ -142,6 +182,13 @@ module Fluent::Plugin
|
|
142
182
|
super
|
143
183
|
end
|
144
184
|
|
185
|
+
RES_TEXT_HEADER = {'Content-Type' => 'text/plain'}.freeze
|
186
|
+
RESPONSE_200 = ["200 OK".freeze, RES_TEXT_HEADER, "".freeze].freeze
|
187
|
+
RESPONSE_204 = ["204 No Content".freeze, {}.freeze].freeze
|
188
|
+
RESPONSE_IMG = ["200 OK".freeze, {'Content-Type'=>'image/gif; charset=utf-8'}.freeze, EMPTY_GIF_IMAGE].freeze
|
189
|
+
RES_400_STATUS = "400 Bad Request".freeze
|
190
|
+
RES_500_STATUS = "500 Internal Server Error".freeze
|
191
|
+
|
145
192
|
def on_request(path_info, params)
|
146
193
|
begin
|
147
194
|
path = path_info[1..-1] # remove /
|
@@ -152,83 +199,77 @@ module Fluent::Plugin
|
|
152
199
|
if record.nil?
|
153
200
|
log.debug { "incoming event is invalid: path=#{path_info} params=#{params.to_json}" }
|
154
201
|
if @respond_with_empty_img
|
155
|
-
return
|
202
|
+
return RESPONSE_IMG
|
156
203
|
else
|
157
204
|
if @use_204_response
|
158
|
-
return
|
205
|
+
return RESPONSE_204
|
159
206
|
else
|
160
|
-
return
|
207
|
+
return RESPONSE_200
|
161
208
|
end
|
162
209
|
end
|
163
210
|
end
|
164
211
|
|
165
|
-
|
166
|
-
if @add_http_headers
|
167
|
-
params.each_pair { |k,v|
|
168
|
-
if k.start_with?("HTTP_")
|
169
|
-
record[k] = v
|
170
|
-
end
|
171
|
-
}
|
172
|
-
end
|
173
|
-
if @add_remote_addr
|
174
|
-
record['REMOTE_ADDR'] = params['REMOTE_ADDR']
|
175
|
-
end
|
176
|
-
end
|
177
|
-
time = if param_time = params['time']
|
178
|
-
param_time = param_time.to_f
|
179
|
-
param_time.zero? ? Fluent::EventTime.now : @float_time_parser.parse(param_time)
|
180
|
-
else
|
181
|
-
record_time.nil? ? Fluent::EventTime.now : record_time
|
182
|
-
end
|
183
|
-
rescue
|
184
|
-
return ["400 Bad Request", {'Content-Type'=>'text/plain'}, "400 Bad Request\n#{$!}\n"]
|
185
|
-
end
|
186
|
-
|
187
|
-
# TODO server error
|
188
|
-
begin
|
212
|
+
mes = nil
|
189
213
|
# Support batched requests
|
190
214
|
if record.is_a?(Array)
|
191
215
|
mes = Fluent::MultiEventStream.new
|
192
216
|
record.each do |single_record|
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
single_record['REMOTE_ADDR'] = params['REMOTE_ADDR']
|
202
|
-
end
|
203
|
-
|
204
|
-
if defined? @parser
|
205
|
-
single_time = @parser.parse_time(single_record)
|
206
|
-
single_time, single_record = @parser.convert_values(single_time, single_record)
|
217
|
+
add_params_to_record(single_record, params)
|
218
|
+
|
219
|
+
if param_time = params['time']
|
220
|
+
param_time = param_time.to_f
|
221
|
+
single_time = param_time.zero? ? Fluent::EventTime.now : @float_time_parser.parse(param_time)
|
222
|
+
elsif @custom_parser
|
223
|
+
single_time = @custom_parser.parse_time(single_record)
|
224
|
+
single_time, single_record = @custom_parser.convert_values(single_time, single_record)
|
207
225
|
else
|
208
|
-
single_time =
|
209
|
-
Fluent::EventTime.from_time(Time.at(t))
|
210
|
-
else
|
211
|
-
time
|
212
|
-
end
|
226
|
+
single_time = convert_time_field(single_record)
|
213
227
|
end
|
214
228
|
|
215
229
|
mes.add(single_time, single_record)
|
216
230
|
end
|
231
|
+
else
|
232
|
+
add_params_to_record(record, params)
|
233
|
+
|
234
|
+
time = if param_time = params['time']
|
235
|
+
param_time = param_time.to_f
|
236
|
+
param_time.zero? ? Fluent::EventTime.now : @float_time_parser.parse(param_time)
|
237
|
+
else
|
238
|
+
if record_time.nil?
|
239
|
+
convert_time_field(record)
|
240
|
+
else
|
241
|
+
record_time
|
242
|
+
end
|
243
|
+
end
|
244
|
+
end
|
245
|
+
rescue => e
|
246
|
+
if @dump_error_log
|
247
|
+
log.error "failed to process request", error: e
|
248
|
+
end
|
249
|
+
return [RES_400_STATUS, RES_TEXT_HEADER, "400 Bad Request\n#{e}\n"]
|
250
|
+
end
|
251
|
+
|
252
|
+
# TODO server error
|
253
|
+
begin
|
254
|
+
if mes
|
217
255
|
router.emit_stream(tag, mes)
|
218
256
|
else
|
219
257
|
router.emit(tag, time, record)
|
220
258
|
end
|
221
|
-
rescue
|
222
|
-
|
259
|
+
rescue => e
|
260
|
+
if @dump_error_log
|
261
|
+
log.error "failed to emit data", error: e
|
262
|
+
end
|
263
|
+
return [RES_500_STATUS, RES_TEXT_HEADER, "500 Internal Server Error\n#{e}\n"]
|
223
264
|
end
|
224
265
|
|
225
266
|
if @respond_with_empty_img
|
226
|
-
return
|
267
|
+
return RESPONSE_IMG
|
227
268
|
else
|
228
269
|
if @use_204_response
|
229
|
-
return
|
270
|
+
return RESPONSE_204
|
230
271
|
else
|
231
|
-
return
|
272
|
+
return RESPONSE_200
|
232
273
|
end
|
233
274
|
end
|
234
275
|
end
|
@@ -267,7 +308,7 @@ module Fluent::Plugin
|
|
267
308
|
|
268
309
|
def parse_params_with_parser(params)
|
269
310
|
if content = params[EVENT_RECORD_PARAMETER]
|
270
|
-
@
|
311
|
+
@custom_parser.parse(content) { |time, record|
|
271
312
|
raise "Received event is not #{@format_name}: #{content}" if record.nil?
|
272
313
|
return time, record
|
273
314
|
}
|
@@ -276,6 +317,32 @@ module Fluent::Plugin
|
|
276
317
|
end
|
277
318
|
end
|
278
319
|
|
320
|
+
def add_params_to_record(record, params)
|
321
|
+
if @add_http_headers
|
322
|
+
params.each_pair { |k, v|
|
323
|
+
if k.start_with?("HTTP_".freeze)
|
324
|
+
record[k] = v
|
325
|
+
end
|
326
|
+
}
|
327
|
+
end
|
328
|
+
|
329
|
+
if @add_remote_addr
|
330
|
+
record['REMOTE_ADDR'] = params['REMOTE_ADDR']
|
331
|
+
end
|
332
|
+
end
|
333
|
+
|
334
|
+
def convert_time_field(record)
|
335
|
+
if t = @default_keep_time_key ? record[@parser_time_key] : record.delete(@parser_time_key)
|
336
|
+
if @default_time_parser
|
337
|
+
@default_time_parser.parse(t)
|
338
|
+
else
|
339
|
+
Fluent::EventTime.from_time(Time.at(t))
|
340
|
+
end
|
341
|
+
else
|
342
|
+
Fluent::EventTime.now
|
343
|
+
end
|
344
|
+
end
|
345
|
+
|
279
346
|
class Handler
|
280
347
|
attr_reader :content_type
|
281
348
|
|
@@ -358,7 +425,7 @@ module Fluent::Plugin
|
|
358
425
|
end
|
359
426
|
}
|
360
427
|
if expect
|
361
|
-
if expect == '100-continue'
|
428
|
+
if expect == '100-continue'.freeze
|
362
429
|
if !size || size < @body_size_limit
|
363
430
|
send_response_nobody("100 Continue", {})
|
364
431
|
else
|
@@ -380,17 +447,20 @@ module Fluent::Plugin
|
|
380
447
|
@body << chunk
|
381
448
|
end
|
382
449
|
|
450
|
+
RES_200_STATUS = "200 OK".freeze
|
451
|
+
RES_403_STATUS = "403 Forbidden".freeze
|
452
|
+
|
383
453
|
# Web browsers can send an OPTIONS request before performing POST
|
384
454
|
# to check if cross-origin requests are supported.
|
385
455
|
def handle_options_request
|
386
456
|
# Is CORS enabled in the first place?
|
387
457
|
if @cors_allow_origins.nil?
|
388
|
-
return send_response_and_close(
|
458
|
+
return send_response_and_close(RES_403_STATUS, {}, "")
|
389
459
|
end
|
390
460
|
|
391
461
|
# in_http does not support HTTP methods except POST
|
392
462
|
if @access_control_request_method != 'POST'
|
393
|
-
return send_response_and_close(
|
463
|
+
return send_response_and_close(RES_403_STATUS, {}, "")
|
394
464
|
end
|
395
465
|
|
396
466
|
header = {
|
@@ -401,19 +471,19 @@ module Fluent::Plugin
|
|
401
471
|
# Check the origin and send back a CORS response
|
402
472
|
if @cors_allow_origins.include?('*')
|
403
473
|
header["Access-Control-Allow-Origin"] = "*"
|
404
|
-
send_response_and_close(
|
474
|
+
send_response_and_close(RES_200_STATUS, header, "")
|
405
475
|
elsif include_cors_allow_origin
|
406
476
|
header["Access-Control-Allow-Origin"] = @origin
|
407
|
-
send_response_and_close(
|
477
|
+
send_response_and_close(RES_200_STATUS, header, "")
|
408
478
|
else
|
409
|
-
send_response_and_close(
|
479
|
+
send_response_and_close(RES_403_STATUS, {}, "")
|
410
480
|
end
|
411
481
|
end
|
412
482
|
|
413
483
|
def on_message_complete
|
414
484
|
return if closing?
|
415
485
|
|
416
|
-
if @parser.http_method == 'OPTIONS'
|
486
|
+
if @parser.http_method == 'OPTIONS'.freeze
|
417
487
|
return handle_options_request()
|
418
488
|
end
|
419
489
|
|
@@ -423,7 +493,7 @@ module Fluent::Plugin
|
|
423
493
|
# restrictions and white listed origins through @cors_allow_origins.
|
424
494
|
unless @cors_allow_origins.nil?
|
425
495
|
unless @cors_allow_origins.include?('*') or include_cors_allow_origin
|
426
|
-
send_response_and_close(
|
496
|
+
send_response_and_close(RES_403_STATUS, {'Connection' => 'close'}, "")
|
427
497
|
return
|
428
498
|
end
|
429
499
|
end
|
@@ -433,14 +503,14 @@ module Fluent::Plugin
|
|
433
503
|
# Decode payload according to the "Content-Encoding" header.
|
434
504
|
# For now, we only support 'gzip' and 'deflate'.
|
435
505
|
begin
|
436
|
-
if @content_encoding == 'gzip'
|
506
|
+
if @content_encoding == 'gzip'.freeze
|
437
507
|
@body = Zlib::GzipReader.new(StringIO.new(@body)).read
|
438
|
-
elsif @content_encoding == 'deflate'
|
508
|
+
elsif @content_encoding == 'deflate'.freeze
|
439
509
|
@body = Zlib::Inflate.inflate(@body)
|
440
510
|
end
|
441
511
|
rescue
|
442
512
|
@log.warn 'fails to decode payload', error: $!.to_s
|
443
|
-
send_response_and_close(
|
513
|
+
send_response_and_close(RES_400_STATUS, {}, "")
|
444
514
|
return
|
445
515
|
end
|
446
516
|
|
@@ -466,8 +536,9 @@ module Fluent::Plugin
|
|
466
536
|
params.merge!(@env)
|
467
537
|
@env.clear
|
468
538
|
|
469
|
-
code, header, body =
|
539
|
+
code, header, body = @callback.call(path_info, params)
|
470
540
|
body = body.to_s
|
541
|
+
header = header.dup if header.frozen?
|
471
542
|
|
472
543
|
unless @cors_allow_origins.nil?
|
473
544
|
if @cors_allow_origins.include?('*')
|
@@ -478,7 +549,7 @@ module Fluent::Plugin
|
|
478
549
|
end
|
479
550
|
|
480
551
|
if @keep_alive
|
481
|
-
header['Connection'] = 'Keep-Alive'
|
552
|
+
header['Connection'] = 'Keep-Alive'.freeze
|
482
553
|
send_response(code, header, body)
|
483
554
|
else
|
484
555
|
send_response_and_close(code, header, body)
|
@@ -504,13 +575,13 @@ module Fluent::Plugin
|
|
504
575
|
|
505
576
|
def send_response(code, header, body)
|
506
577
|
header['Content-Length'] ||= body.bytesize
|
507
|
-
header['Content-Type'] ||= 'text/plain'
|
578
|
+
header['Content-Type'] ||= 'text/plain'.freeze
|
508
579
|
|
509
580
|
data = %[HTTP/1.1 #{code}\r\n]
|
510
581
|
header.each_pair {|k,v|
|
511
582
|
data << "#{k}: #{v}\r\n"
|
512
583
|
}
|
513
|
-
data << "\r\n"
|
584
|
+
data << "\r\n".freeze
|
514
585
|
@io.write(data)
|
515
586
|
|
516
587
|
@io.write(body)
|
@@ -521,7 +592,7 @@ module Fluent::Plugin
|
|
521
592
|
header.each_pair {|k,v|
|
522
593
|
data << "#{k}: #{v}\r\n"
|
523
594
|
}
|
524
|
-
data << "\r\n"
|
595
|
+
data << "\r\n".freeze
|
525
596
|
@io.write(data)
|
526
597
|
end
|
527
598
|
|
@@ -271,9 +271,9 @@ module Fluent::Plugin
|
|
271
271
|
end
|
272
272
|
else
|
273
273
|
if is_file
|
274
|
-
unless @ignore_list.include?(
|
274
|
+
unless @ignore_list.include?(p)
|
275
275
|
log.warn "#{p} unreadable. It is excluded and would be examined next time."
|
276
|
-
@ignore_list <<
|
276
|
+
@ignore_list << p if @ignore_repeated_permission_error
|
277
277
|
end
|
278
278
|
end
|
279
279
|
false
|
@@ -259,6 +259,9 @@ module Fluent
|
|
259
259
|
|
260
260
|
if !mode.include?(:stderr) && !mode.include?(:read_with_stderr)
|
261
261
|
spawn_opts[:err] = IO::NULL if stderr == :discard
|
262
|
+
if !mode.include?(:read) && !mode.include?(:read_with_stderr)
|
263
|
+
spawn_opts[:out] = IO::NULL
|
264
|
+
end
|
262
265
|
writeio, readio, wait_thread = *Open3.popen2(*spawn_args, spawn_opts)
|
263
266
|
elsif mode.include?(:read_with_stderr)
|
264
267
|
writeio, readio, wait_thread = *Open3.popen2e(*spawn_args, spawn_opts)
|
@@ -275,8 +278,6 @@ module Fluent
|
|
275
278
|
if mode.include?(:read) || mode.include?(:read_with_stderr)
|
276
279
|
readio.set_encoding(external_encoding, internal_encoding, **encoding_options)
|
277
280
|
readio_in_use = true
|
278
|
-
else
|
279
|
-
readio.reopen(IO::NULL) if readio
|
280
281
|
end
|
281
282
|
if mode.include?(:stderr)
|
282
283
|
stderrio.set_encoding(external_encoding, internal_encoding, **encoding_options)
|
data/lib/fluent/version.rb
CHANGED
data/test/plugin/test_in_http.rb
CHANGED
@@ -116,6 +116,36 @@ class HttpInputTest < Test::Unit::TestCase
|
|
116
116
|
assert_equal_event_time time, d.events[1][1]
|
117
117
|
end
|
118
118
|
|
119
|
+
data('json' => ['json', :to_json],
|
120
|
+
'msgpack' => ['msgpack', :to_msgpack])
|
121
|
+
def test_default_with_time_format(data)
|
122
|
+
param, method_name = data
|
123
|
+
d = create_driver(CONFIG + %[
|
124
|
+
<parse>
|
125
|
+
keep_time_key
|
126
|
+
time_format %iso8601
|
127
|
+
</parse>
|
128
|
+
])
|
129
|
+
|
130
|
+
time = event_time("2020-06-10T01:14:27+00:00")
|
131
|
+
events = [
|
132
|
+
["tag1", time, {"a" => 1, "time" => '2020-06-10T01:14:27+00:00'}],
|
133
|
+
["tag2", time, {"a" => 2, "time" => '2020-06-10T01:14:27+00:00'}],
|
134
|
+
]
|
135
|
+
res_codes = []
|
136
|
+
|
137
|
+
d.run(expect_records: 2) do
|
138
|
+
events.each do |tag, t, record|
|
139
|
+
res = post("/#{tag}", {param => record.__send__(method_name)})
|
140
|
+
res_codes << res.code
|
141
|
+
end
|
142
|
+
end
|
143
|
+
assert_equal ["200", "200"], res_codes
|
144
|
+
assert_equal events, d.events
|
145
|
+
assert_equal_event_time time, d.events[0][1]
|
146
|
+
assert_equal_event_time time, d.events[1][1]
|
147
|
+
end
|
148
|
+
|
119
149
|
def test_multi_json
|
120
150
|
d = create_driver
|
121
151
|
time = event_time("2011-01-02 13:14:15 UTC")
|
@@ -163,6 +193,33 @@ class HttpInputTest < Test::Unit::TestCase
|
|
163
193
|
assert_equal_event_time time, d.events[1][1]
|
164
194
|
end
|
165
195
|
|
196
|
+
data('json' => ['json', :to_json],
|
197
|
+
'msgpack' => ['msgpack', :to_msgpack])
|
198
|
+
def test_default_multi_with_time_format(data)
|
199
|
+
param, method_name = data
|
200
|
+
d = create_driver(CONFIG + %[
|
201
|
+
<parse>
|
202
|
+
keep_time_key
|
203
|
+
time_format %iso8601
|
204
|
+
</parse>
|
205
|
+
])
|
206
|
+
time = event_time("2020-06-10T01:14:27+00:00")
|
207
|
+
events = [
|
208
|
+
["tag1", time, {'a' => 1, 'time' => "2020-06-10T01:14:27+00:00"}],
|
209
|
+
["tag1", time, {'a' => 2, 'time' => "2020-06-10T01:14:27+00:00"}],
|
210
|
+
]
|
211
|
+
tag = "tag1"
|
212
|
+
res_codes = []
|
213
|
+
d.run(expect_records: 2, timeout: 5) do
|
214
|
+
res = post("/#{tag}", {param => events.map { |e| e[2] }.__send__(method_name)})
|
215
|
+
res_codes << res.code
|
216
|
+
end
|
217
|
+
assert_equal ["200"], res_codes
|
218
|
+
assert_equal events, d.events
|
219
|
+
assert_equal_event_time time, d.events[0][1]
|
220
|
+
assert_equal_event_time time, d.events[1][1]
|
221
|
+
end
|
222
|
+
|
166
223
|
def test_multi_json_with_nonexistent_time_key
|
167
224
|
d = create_driver(CONFIG + %[
|
168
225
|
<parse>
|
@@ -818,5 +818,20 @@ class ChildProcessTest < Test::Unit::TestCase
|
|
818
818
|
end
|
819
819
|
assert File.exist?(@temp_path)
|
820
820
|
end
|
821
|
+
|
822
|
+
test 'execute child process writing data to stdout which is unread' do
|
823
|
+
callback_called = false
|
824
|
+
exit_status = nil
|
825
|
+
prog = "echo writing to stdout"
|
826
|
+
callback = ->(status){ exit_status = status; callback_called = true }
|
827
|
+
Timeout.timeout(TEST_DEADLOCK_TIMEOUT) do
|
828
|
+
@d.child_process_execute(:out_exec_process, prog, stderr: :connect, immediate: true, parallel: true, mode: [], wait_timeout: 1, on_exit_callback: callback)
|
829
|
+
sleep TEST_WAIT_INTERVAL_FOR_BLOCK_RUNNING until callback_called
|
830
|
+
end
|
831
|
+
assert callback_called
|
832
|
+
assert exit_status
|
833
|
+
assert exit_status.success?
|
834
|
+
assert_equal 0, exit_status.exitstatus
|
835
|
+
end
|
821
836
|
end
|
822
837
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fluentd
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.11.
|
4
|
+
version: 1.11.1
|
5
5
|
platform: x86-mingw32
|
6
6
|
authors:
|
7
7
|
- Sadayuki Furuhashi
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-06-
|
11
|
+
date: 2020-06-22 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: msgpack
|