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

fix max limit for connect timeout #31

Merged
merged 1 commit into from
Jul 20, 2022
Merged

fix max limit for connect timeout #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 3 additions & 8 deletions src/curl.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,15 +215,10 @@ function recv_data(easy::Curl.Easy, output::Channel{T}, max_recv_message_length:
end

function set_connect_timeout(easy::Curl.Easy, timeout::Real)
timeout >= 0 ||
(0 ≤ timeout ≤ (typemax(Clong) ÷ 1000)) ||
throw(ArgumentError("timeout must be positive, got $timeout"))
if timeout ≤ typemax(Clong) ÷ 1000
timeout_ms = round(Clong, timeout * 1000)
Curl.setopt(easy, CURLOPT_CONNECTTIMEOUT_MS, timeout_ms)
else
timeout = timeout ≤ typemax(Clong) ? round(Clong, timeout) : Clong(0)
Curl.setopt(easy, CURLOPT_CONNECTTIMEOUT, timeout)
end
timeout_ms = round(Clong, timeout * 1000)
Curl.setopt(easy, CURLOPT_CONNECTTIMEOUT_MS, timeout_ms)
end

# Prevent reuse of this handle
Expand Down
7 changes: 4 additions & 3 deletions src/grpc.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ Contains settings to control the behavior of gRPC requests.
tls), or `:http2` (http2 upgrade)
- `revocation`: whether to check for certificate recovation (default is true)
- `request_timeout`: request timeout (seconds)
- `connect_timeout`: connect timeout (seconds) (default is 300 seconds, same
as setting this to 0)
- `connect_timeout`: connect timeout (seconds) (must be ≤ typemax(Clong)÷1000,
default is 300 seconds, same as setting this to 0)
- `max_message_length`: maximum message length (default is 4MB)
- `max_recv_message_length`: maximum message length to receive (default is
`max_message_length`, same as setting this to 0)
Expand Down Expand Up @@ -126,7 +126,8 @@ struct gRPCController <: ProtoRpcController
enable_shared_locks::Bool = false,
verbose::Bool = false
)
if maxage < 0 || keepalive < 0 || request_timeout < 0 || connect_timeout < 0 ||
if maxage < 0 || keepalive < 0 || request_timeout < 0 ||
connect_timeout < 0 || connect_timeout > (typemax(Clong) ÷ 1000) ||
max_message_length < 0 || max_recv_message_length < 0 || max_send_message_length < 0
throw(ArgumentError("Invalid gRPCController parameter"))
end
Expand Down
10 changes: 7 additions & 3 deletions test/test_grpcerrors.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,13 @@ end

function test_connect_timeout()
timeout_server_endpoint = "http://10.255.255.1/" # a non routable IP
timeout_secs = 5
client = GRPCErrorsBlockingClient(timeout_server_endpoint; verbose=false, connect_timeout=timeout_secs)

@testset "connect timeout" begin
@test_throws ArgumentError GRPCErrorsBlockingClient(timeout_server_endpoint; verbose=false, connect_timeout=typemax(Clong))
@test_throws ArgumentError GRPCErrorsBlockingClient(timeout_server_endpoint; verbose=false, connect_timeout=-1)

timeout_secs = 5
client = GRPCErrorsBlockingClient(timeout_server_endpoint; verbose=false, connect_timeout=timeout_secs)
data = GrpcerrorsClients.Data(; mode=1, param=0)
t1 = time()
try
Expand All @@ -166,4 +170,4 @@ end
function test_clients(server_endpoint::String)
@info("testing blocking client")
test_blocking_client(server_endpoint)
end
end