Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add keep alive to tcp plugin #3961

Closed
wants to merge 2 commits into from
Closed

Add keep alive to tcp plugin #3961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
488f942
Add keep alive to tcp plugin
DimitarKiryakovSAP Nov 15, 2022
a1717b4
Fix tests
DimitarKiryakovSAP Nov 15, 2022
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
6 changes: 4 additions & 2 deletions lib/fluent/plugin/in_tcp.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ class TcpInput < Input

desc 'The payload is read up to this character.'
config_param :delimiter, :string, default: "\n" # syslog family add "\n" to each message and this seems only way to split messages in tcp stream
desc 'Check the remote connection is still available by sending a keepalive packet if this value is true.'
config_param :send_keepalive_packet, :bool, default: false

# in_forward like host/network restriction
config_section :security, required: false, multi: false do
Expand Down Expand Up @@ -101,7 +103,7 @@ def start
log.info "listening tcp socket", bind: @bind, port: @port
del_size = @delimiter.length
if @_extract_enabled && @_extract_tag_key
server_create(:in_tcp_server_single_emit, @port, bind: @bind, resolve_name: !!@source_hostname_key) do |data, conn|
server_create(:in_tcp_server_single_emit, @port, bind: @bind, resolve_name: !!@source_hostname_key, send_keepalive_packet: @send_keepalive_packet) do |data, conn|
unless check_client(conn)
conn.close
next
Expand Down Expand Up @@ -131,7 +133,7 @@ def start
buf.slice!(0, pos) if pos > 0
end
else
server_create(:in_tcp_server_batch_emit, @port, bind: @bind, resolve_name: !!@source_hostname_key) do |data, conn|
server_create(:in_tcp_server_batch_emit, @port, bind: @bind, resolve_name: !!@source_hostname_key, send_keepalive_packet: @send_keepalive_packet) do |data, conn|
unless check_client(conn)
conn.close
next
Expand Down
8 changes: 8 additions & 0 deletions test/plugin/test_in_tcp.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,14 @@ def create_tcp_socket(host, port, &block)
assert_equal hostname, event[2]['host']
end

test "send_keepalive_packet_can_be_enabled" do
d = create_driver(base_config + %!
format none
send_keepalive_packet true
!)
assert_true d.instance.send_keepalive_packet
end

test 'source_address_key' do
d = create_driver(base_config + %!
format none
Expand Down