Compare commits
1 Commits
cuddle-ple
...
036abcc407
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
036abcc407 |
13
CHANGELOG.md
13
CHANGELOG.md
@@ -6,20 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
## [0.10.1] - 2025-11-29
|
## [0.8.2] - 2025-11-14
|
||||||
|
|
||||||
### Other
|
|
||||||
- *(deps)* update tokio-tracing monorepo (#41)
|
|
||||||
|
|
||||||
## [0.10.0] - 2025-11-15
|
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
- implement take errors
|
|
||||||
|
|
||||||
## [0.9.0] - 2025-11-15
|
|
||||||
|
|
||||||
### Added
|
|
||||||
- mad not properly surfaces panics
|
|
||||||
- add publish
|
- add publish
|
||||||
- add readme
|
- add readme
|
||||||
|
|
||||||
|
|||||||
20
Cargo.lock
generated
20
Cargo.lock
generated
@@ -222,7 +222,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "notmad"
|
name = "notmad"
|
||||||
version = "0.10.0"
|
version = "0.8.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@@ -243,7 +243,7 @@ version = "0.50.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
|
checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-sys 0.60.2",
|
"windows-sys 0.61.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -503,9 +503,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tracing"
|
name = "tracing"
|
||||||
version = "0.1.43"
|
version = "0.1.41"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647"
|
checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
@@ -515,9 +515,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tracing-attributes"
|
name = "tracing-attributes"
|
||||||
version = "0.1.31"
|
version = "0.1.28"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
|
checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
@@ -526,9 +526,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tracing-core"
|
name = "tracing-core"
|
||||||
version = "0.1.35"
|
version = "0.1.33"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c"
|
checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"valuable",
|
"valuable",
|
||||||
@@ -547,9 +547,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tracing-subscriber"
|
name = "tracing-subscriber"
|
||||||
version = "0.3.22"
|
version = "0.3.20"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
|
checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"matchers",
|
"matchers",
|
||||||
"nu-ansi-term",
|
"nu-ansi-term",
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ members = ["crates/*"]
|
|||||||
resolver = "2"
|
resolver = "2"
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "0.10.1"
|
version = "0.8.2"
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
mad = { path = "crates/mad" }
|
mad = { path = "crates/mad" }
|
||||||
|
|||||||
@@ -77,11 +77,8 @@
|
|||||||
|
|
||||||
use futures::stream::FuturesUnordered;
|
use futures::stream::FuturesUnordered;
|
||||||
use futures_util::StreamExt;
|
use futures_util::StreamExt;
|
||||||
use std::{error::Error, fmt::Display, sync::Arc};
|
use std::{fmt::Display, sync::Arc, error::Error};
|
||||||
use tokio::{
|
use tokio::signal::unix::{SignalKind, signal};
|
||||||
signal::unix::{SignalKind, signal},
|
|
||||||
task::JoinError,
|
|
||||||
};
|
|
||||||
|
|
||||||
use tokio_util::sync::CancellationToken;
|
use tokio_util::sync::CancellationToken;
|
||||||
|
|
||||||
@@ -104,13 +101,15 @@ pub enum MadError {
|
|||||||
|
|
||||||
/// Error that occurred during the run phase of a component.
|
/// Error that occurred during the run phase of a component.
|
||||||
#[error(transparent)]
|
#[error(transparent)]
|
||||||
RunError { run: anyhow::Error },
|
RunError {
|
||||||
|
run: anyhow::Error
|
||||||
|
},
|
||||||
|
|
||||||
/// Error that occurred during the close phase of a component.
|
/// Error that occurred during the close phase of a component.
|
||||||
#[error("component(s) failed during close")]
|
#[error("component(s) failed during close")]
|
||||||
CloseError {
|
CloseError {
|
||||||
#[source]
|
#[source]
|
||||||
close: anyhow::Error,
|
close: anyhow::Error
|
||||||
},
|
},
|
||||||
|
|
||||||
/// Multiple errors from different components.
|
/// Multiple errors from different components.
|
||||||
@@ -166,10 +165,6 @@ impl AggregateError {
|
|||||||
pub fn get_errors(&self) -> &[MadError] {
|
pub fn get_errors(&self) -> &[MadError] {
|
||||||
&self.errors
|
&self.errors
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn take_errors(self) -> Vec<MadError> {
|
|
||||||
self.errors
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Display for AggregateError {
|
impl Display for AggregateError {
|
||||||
@@ -506,32 +501,11 @@ impl Mad {
|
|||||||
|
|
||||||
tracing::debug!(component = name, "mad running");
|
tracing::debug!(component = name, "mad running");
|
||||||
|
|
||||||
let handle = tokio::spawn(async move { comp.run(job_cancellation).await });
|
|
||||||
|
|
||||||
tokio::select! {
|
tokio::select! {
|
||||||
_ = cancellation_token.cancelled() => {
|
_ = cancellation_token.cancelled() => {
|
||||||
error_tx.send(CompletionResult { res: Ok(()) , name }).await
|
error_tx.send(CompletionResult { res: Ok(()) , name }).await
|
||||||
}
|
}
|
||||||
res = handle => {
|
res = comp.run(job_cancellation) => {
|
||||||
let res = match res {
|
|
||||||
Ok(res) => res,
|
|
||||||
Err(join) => {
|
|
||||||
match join.source() {
|
|
||||||
Some(error) => {
|
|
||||||
Err(MadError::RunError{run: anyhow::anyhow!("component aborted: {:?}", error)})
|
|
||||||
},
|
|
||||||
None => {
|
|
||||||
if join.is_panic(){
|
|
||||||
Err(MadError::RunError { run: anyhow::anyhow!("component panicked: {}", join) })
|
|
||||||
} else {
|
|
||||||
Err(MadError::RunError { run: anyhow::anyhow!("component faced unknown error: {}", join) })
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
error_tx.send(CompletionResult { res , name }).await
|
error_tx.send(CompletionResult { res , name }).await
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -844,13 +818,13 @@ mod tests {
|
|||||||
fn test_aggregate_error_display() {
|
fn test_aggregate_error_display() {
|
||||||
let error1 = MadError::Inner(
|
let error1 = MadError::Inner(
|
||||||
anyhow::anyhow!("database connection failed")
|
anyhow::anyhow!("database connection failed")
|
||||||
.context("failed to connect to PostgreSQL"),
|
.context("failed to connect to PostgreSQL")
|
||||||
);
|
);
|
||||||
|
|
||||||
let error2 = MadError::Inner(
|
let error2 = MadError::Inner(
|
||||||
anyhow::anyhow!("port already in use")
|
anyhow::anyhow!("port already in use")
|
||||||
.context("failed to bind to port 8080")
|
.context("failed to bind to port 8080")
|
||||||
.context("web server initialization failed"),
|
.context("web server initialization failed")
|
||||||
);
|
);
|
||||||
|
|
||||||
let aggregate = MadError::AggregateError(AggregateError {
|
let aggregate = MadError::AggregateError(AggregateError {
|
||||||
@@ -890,7 +864,7 @@ mod tests {
|
|||||||
let error = MadError::Inner(
|
let error = MadError::Inner(
|
||||||
anyhow::anyhow!("root cause")
|
anyhow::anyhow!("root cause")
|
||||||
.context("middle layer")
|
.context("middle layer")
|
||||||
.context("top layer"),
|
.context("top layer")
|
||||||
);
|
);
|
||||||
|
|
||||||
// Test that we can access the error chain
|
// Test that we can access the error chain
|
||||||
|
|||||||
@@ -138,30 +138,6 @@ async fn test_can_shutdown_gracefully() -> anyhow::Result<()> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
#[traced_test]
|
|
||||||
async fn test_component_panics_shutdowns_cleanly() -> anyhow::Result<()> {
|
|
||||||
let res = Mad::builder()
|
|
||||||
.add_fn({
|
|
||||||
move |_cancel| async move {
|
|
||||||
panic!("my inner panic");
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.add_fn(|cancel| async move {
|
|
||||||
cancel.cancelled().await;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
})
|
|
||||||
.run()
|
|
||||||
.await;
|
|
||||||
|
|
||||||
let err_content = res.unwrap_err().to_string();
|
|
||||||
assert!(err_content.contains("component panicked"));
|
|
||||||
assert!(err_content.contains("my inner panic"));
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_can_easily_transform_error() -> anyhow::Result<()> {
|
fn test_can_easily_transform_error() -> anyhow::Result<()> {
|
||||||
fn fallible() -> anyhow::Result<()> {
|
fn fallible() -> anyhow::Result<()> {
|
||||||
|
|||||||
Reference in New Issue
Block a user