Compare commits

...

3 Commits

Author SHA1 Message Date
Mike Nguyen a5296a05a6
release: v0.16.0-rc.4
Signed-off-by: Mike Nguyen <hey@mike.ee>
2024-12-16 12:07:12 +00:00
Mike Nguyen 7ac6efe011
Merge branch 'release-0.16' into http-server-error-handling 2024-12-10 19:25:49 +00:00
Leon Matthes e86e9158e1 Return Result when creating DaprHttpServer
Especially when running custom docker setups, the container that
contains the sidecar may not be running exactly when the Rust code
starts running.

To fix this, before we needed to sleep(2s) to avoid a panic in the Rust
program.
With this patch, this can be handled on the user side (e.g. the
connection can be retried multiple times with timeouts in-between).

Signed-off-by: Leon Matthes <leon.matthes@kdab.com>
2024-12-10 10:18:18 +01:00
3 changed files with 34 additions and 9 deletions

View File

@ -28,7 +28,7 @@ tonic = "0.12.1"
tonic-build = "0.12.1"
[workspace.package]
version = "0.16.0-rc.3"
version = "0.16.0-rc.4"
authors = [
"Mike Nguyen <hey@mike.ee>",
"The Dapr Authors <dapr@dapr.io>"

View File

@ -53,7 +53,7 @@ Add the following to your `Cargo.toml` file:
```toml
[dependencies]
dapr = "0.16.0-rc.3"
dapr = "0.16.0-rc.4"
```
Here's a basic example to create a client:

View File

@ -84,6 +84,12 @@ pub struct DaprHttpServer {
impl DaprHttpServer {
/// Creates a new instance of the Dapr HTTP server with default options.
///
/// # Panics
///
/// This function panics if the Dapr Sidecar cannot be reached!
/// For a non-panicking version that allows you to handle any errors yourself, see:
/// [DaprHttpServer::try_new_with_dapr_port]
pub async fn new() -> Self {
let dapr_port: u16 = std::env::var("DAPR_GRPC_PORT")
.unwrap_or("3501".into())
@ -92,19 +98,38 @@ impl DaprHttpServer {
Self::with_dapr_port(dapr_port).await
}
/// Creates a new instance of the Dapr HTTP server that connects to the Dapr sidecar on the
/// given dapr_port.
///
/// # Panics
///
/// This function panics if the Dapr Sidecar cannot be reached!
/// For a non-panicking version that allows you to handle any errors yourself, see:
/// [DaprHttpServer::try_new_with_dapr_port]
pub async fn with_dapr_port(dapr_port: u16) -> Self {
let dapr_addr = format!("https://127.0.0.1:{}", dapr_port);
let cc = match TonicClient::connect(dapr_addr).await {
match Self::try_new_with_dapr_port(dapr_port).await {
Ok(c) => c,
Err(err) => panic!("failed to connect to dapr: {}", err),
};
}
}
/// Creates a new instance of the Dapr HTTP server that connects to the Dapr sidecar on the
/// given dapr_port.
///
/// In contrast to the other functions that create a DaprHttpServer, this function does
/// not panic, but instead returns a Result.
pub async fn try_new_with_dapr_port(
dapr_port: u16,
) -> Result<Self, Box<dyn std::error::Error>> {
let dapr_addr = format!("https://127.0.0.1:{}", dapr_port);
let cc = TonicClient::connect(dapr_addr).await?;
let rt = ActorRuntime::new(cc);
DaprHttpServer {
Ok(DaprHttpServer {
actor_runtime: Arc::new(rt),
shutdown_signal: None,
}
})
}
pub fn with_graceful_shutdown<F>(self, signal: F) -> Self
@ -138,7 +163,7 @@ impl DaprHttpServer {
.unwrap_or(8080);
let address = format!("127.0.0.1:{}", port.unwrap_or(default_port));
let listener = TcpListener::bind(address).await.unwrap();
let listener = TcpListener::bind(address).await?;
let server = axum::serve(listener, app.into_make_service());