Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ tracing = { version = "0.1.41", features = ["log"] }
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }

[workspace.package]
version = "0.2.0"
version = "0.2.1"
license = "MIT"
edition = "2021"
13 changes: 7 additions & 6 deletions concurrency/src/tasks/gen_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ pub trait GenServer: Send + Sized + Clone {
) -> impl Future<Output = Result<(), GenServerError>> + Send {
async {
let init_result = self
.clone()
.init(handle)
.await
.inspect_err(|err| tracing::error!("Initialization failed: {err:?}"));
Expand All @@ -157,10 +156,12 @@ pub trait GenServer: Send + Sized + Clone {
};

handle.cancellation_token().cancel();
if let Err(err) = self.teardown(handle).await {
tracing::error!("Error during teardown: {err:?}");
if let Ok(final_state) = res {
if let Err(err) = final_state.teardown(handle).await {
tracing::error!("Error during teardown: {err:?}");
}
}
res
Ok(())
}
}

Expand All @@ -178,7 +179,7 @@ pub trait GenServer: Send + Sized + Clone {
mut self,
handle: &GenServerHandle<Self>,
rx: &mut mpsc::Receiver<GenServerInMsg<Self>>,
) -> impl Future<Output = Result<(), GenServerError>> + Send {
) -> impl Future<Output = Result<Self, GenServerError>> + Send {
async {
loop {
let (new_state, cont) = self.receive(handle, rx).await?;
Expand All @@ -188,7 +189,7 @@ pub trait GenServer: Send + Sized + Clone {
}
}
tracing::trace!("Stopping GenServer");
Ok(())
Ok(self)
}
}

Expand Down