Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/fluent/plugin/in_s3.rb
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ def run
begin
@poller.poll(options) do |message|
begin
body = Yajl.load(message.body)
body = JSON.parse(message.body)
log.debug(body)
next unless is_valid_queue(body) # skip test queue
if @match_regexp
Expand Down
22 changes: 11 additions & 11 deletions test/test_in_s3.rb
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ def test_one_record
}
]
}
message = Struct::StubMessage.new(1, 1, Yajl.dump(body))
message = Struct::StubMessage.new(1, 1, JSON.generate(body))
@sqs_poller.get_messages(anything, anything) do |config, stats|
config.before_request.call(stats) if config.before_request
stats.request_count += 1
Expand Down Expand Up @@ -376,7 +376,7 @@ def test_one_record_with_metadata
}
]
}
message = Struct::StubMessage.new(1, 1, Yajl.dump(body))
message = Struct::StubMessage.new(1, 1, JSON.generate(body))
@sqs_poller.get_messages(anything, anything) do |config, stats|
config.before_request.call(stats) if config.before_request
stats.request_count += 1
Expand Down Expand Up @@ -411,7 +411,7 @@ def test_one_record_url_encoded
}
]
}
message = Struct::StubMessage.new(1, 1, Yajl.dump(body))
message = Struct::StubMessage.new(1, 1, JSON.generate(body))
@sqs_poller.get_messages(anything, anything) do |config, stats|
config.before_request.call(stats) if config.before_request
stats.request_count += 1
Expand Down Expand Up @@ -446,7 +446,7 @@ def test_one_record_url_encoded_with_metadata
}
]
}
message = Struct::StubMessage.new(1, 1, Yajl.dump(body))
message = Struct::StubMessage.new(1, 1, JSON.generate(body))
@sqs_poller.get_messages(anything, anything) do |config, stats|
config.before_request.call(stats) if config.before_request
stats.request_count += 1
Expand Down Expand Up @@ -481,7 +481,7 @@ def test_one_record_multi_line
}
]
}
message = Struct::StubMessage.new(1, 1, Yajl.dump(body))
message = Struct::StubMessage.new(1, 1, JSON.generate(body))
@sqs_poller.get_messages(anything, anything) do |config, stats|
config.before_request.call(stats) if config.before_request
stats.request_count += 1
Expand Down Expand Up @@ -521,7 +521,7 @@ def test_one_record_multi_line_with_metadata
}
]
}
message = Struct::StubMessage.new(1, 1, Yajl.dump(body))
message = Struct::StubMessage.new(1, 1, JSON.generate(body))
@sqs_poller.get_messages(anything, anything) do |config, stats|
config.before_request.call(stats) if config.before_request
stats.request_count += 1
Expand Down Expand Up @@ -569,7 +569,7 @@ def test_gzip_single_stream
}
]
}
message = Struct::StubMessage.new(1, 1, Yajl.dump(body))
message = Struct::StubMessage.new(1, 1, JSON.generate(body))
@sqs_poller.get_messages(anything, anything) do |config, stats|
config.before_request.call(stats) if config.before_request
stats.request_count += 1
Expand Down Expand Up @@ -620,7 +620,7 @@ def test_gzip_multiple_steams
}
]
}
message = Struct::StubMessage.new(1, 1, Yajl.dump(body))
message = Struct::StubMessage.new(1, 1, JSON.generate(body))
@sqs_poller.get_messages(anything, anything) do |config, stats|
config.before_request.call(stats) if config.before_request
stats.request_count += 1
Expand Down Expand Up @@ -661,7 +661,7 @@ def test_regexp_matching
}
]
}
message = Struct::StubMessage.new(1, 1, Yajl.dump(body))
message = Struct::StubMessage.new(1, 1, JSON.generate(body))
@sqs_poller.get_messages(anything, anything) do |config, stats|
config.before_request.call(stats) if config.before_request
stats.request_count += 1
Expand Down Expand Up @@ -690,7 +690,7 @@ def test_regexp_not_matching
}
]
}
message = Struct::StubMessage.new(1, 1, Yajl.dump(body))
message = Struct::StubMessage.new(1, 1, JSON.generate(body))
@sqs_poller.get_messages(anything, anything) do |config, stats|
config.before_request.call(stats) if config.before_request
stats.request_count += 1
Expand Down Expand Up @@ -735,7 +735,7 @@ def test_event_bridge_mode
}
}

message = Struct::StubMessage.new(1, 1, Yajl.dump(body))
message = Struct::StubMessage.new(1, 1, JSON.generate(body))
@sqs_poller.get_messages(anything, anything) do |config, stats|
config.before_request.call(stats) if config.before_request
stats.request_count += 1
Expand Down