Skip to content

fix: Add configration for connection timeout #6

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

Draft
eginez wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

fix: Add configration for connection timeout #6

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1cd5cd9
add connection timeout setting
eginez Jan 9, 2024
898d5f2
build failure
eginez Jan 9, 2024
edbe7e5
cargo fmt
eginez Jan 9, 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
15 changes: 11 additions & 4 deletions qcs-api-client-grpc/src/channel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,15 @@ pub fn get_endpoint(uri: Uri) -> Endpoint {
}

/// Get an [`Endpoint`] for the given [`Uri`] and timeout.
pub fn get_endpoint_with_timeout(uri: Uri, timeout: Option<Duration>) -> Endpoint {
pub fn get_endpoint_with_timeout(
uri: Uri,
timeout: Option<Duration>,
connection_timeout: Option<Duration>,
) -> Endpoint {
if let Some(duration) = timeout {
get_endpoint(uri).timeout(duration)
get_endpoint(uri)
.timeout(duration)
.connect_timeout(connection_timeout.unwrap_or_default())
} else {
get_endpoint(uri)
}
Expand Down Expand Up @@ -149,7 +155,7 @@ pub fn get_channel(uri: Uri) -> Result<Channel, ChannelError> {
get_channel_with_endpoint(endpoint)
}

/// Get a [`Channel`] to the given [`Uri`], with an optional timeout. If set to [`None`], no timeout is
/// Get a [`Channel`] to the given [`Uri`], with optional timeouts. If set to [`None`], no timeouts are
/// used.
/// Sets up things like user agent without setting up QCS credentials.
///
Expand All @@ -164,8 +170,9 @@ pub fn get_channel(uri: Uri) -> Result<Channel, ChannelError> {
pub fn get_channel_with_timeout(
uri: Uri,
timeout: Option<Duration>,
connection_timeout: Option<Duration>,
) -> Result<Channel, ChannelError> {
let endpoint = get_endpoint_with_timeout(uri, timeout);
let endpoint = get_endpoint_with_timeout(uri, timeout, connection_timeout);
get_channel_with_endpoint(endpoint)
}

Expand Down