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

Jump to bottom

option --term-timeout force closes server X seconds after TERM #147

Merged
merged 3 commits into from
May 6, 2024
Merged

option --term-timeout force closes server X seconds after TERM #147

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dda5942
option --term-timeout force closes server X seconds after TERM
carlhoerberg Mar 6, 2024
e2cd981
fixup! option --term-timeout force closes server X seconds after TERM
carlhoerberg May 6, 2024
070e0e1
Allow --term-timout 0, -1 means infinite
carlhoerberg May 6, 2024
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
13 changes: 12 additions & 1 deletion src/amqproxy.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class AMQProxy::CLI
@listen_port = ENV["LISTEN_PORT"]? || 5673
@log_level : Log::Severity = Log::Severity::Info
@idle_connection_timeout : Int32 = ENV.fetch("IDLE_CONNECTION_TIMEOUT", "5").to_i
@term_timeout = 0
@upstream = ENV["AMQP_URL"]?

def parse_config(path)
Expand All @@ -21,6 +22,7 @@ class AMQProxy::CLI
when "upstream" then @upstream = value
when "log_level" then @log_level = Log::Severity.parse(value)
when "idle_connection_timeout" then @idle_connection_timeout = value.to_i
when "term_timeout" then @term_timeout = value.to_i
else raise "Unsupported config #{name}/#{key}"
end
end
Expand Down Expand Up @@ -50,6 +52,9 @@ class AMQProxy::CLI
parser.on("-t IDLE_CONNECTION_TIMEOUT", "--idle-connection-timeout=SECONDS", "Maxiumum time in seconds an unused pooled connection stays open (default 5s)") do |v|
@idle_connection_timeout = v.to_i
end
parser.on("--term-timeout=SECONDS", "At TERM the server will wait this many seconds for clients to gracefully close their sockets (default: infinite)") do |v|
carlhoerberg marked this conversation as resolved.
Show resolved Hide resolved
@term_timeout = v.to_i
end
parser.on("-d", "--debug", "Verbose logging") { @log_level = Log::Severity::Debug }
parser.on("-c FILE", "--config=FILE", "Load config file") { |v| parse_config(v) }
parser.on("-h", "--help", "Show this help") { puts parser.to_s; exit 0 }
Expand Down Expand Up @@ -86,8 +91,14 @@ class AMQProxy::CLI
first_shutdown = false
server.stop_accepting_clients
server.disconnect_clients
if @term_timeout > 0
spawn do
sleep @term_timeout
abort "Exiting with #{server.client_connections} client connections still open"
end
end
else
server.close_sockets
abort "Exiting with #{server.client_connections} client connections still open"
end
end
Signal::INT.trap &shutdown
Expand Down
Loading