a bit of error context

This commit is contained in:
phiresky 2023-02-21 12:40:43 +01:00
parent 78caa434cc
commit eef7c2bc04
6 changed files with 71 additions and 17 deletions

48
Cargo.lock generated
View File

@ -2,6 +2,15 @@
# It is not intended for manual editing. # It is not intended for manual editing.
version = 3 version = 3
[[package]]
name = "addr2line"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
dependencies = [
"gimli",
]
[[package]] [[package]]
name = "adler" name = "adler"
version = "1.0.2" version = "1.0.2"
@ -66,6 +75,9 @@ name = "anyhow"
version = "1.0.69" version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
dependencies = [
"backtrace",
]
[[package]] [[package]]
name = "arrayref" name = "arrayref"
@ -171,6 +183,21 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "backtrace"
version = "0.3.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
dependencies = [
"addr2line",
"cc",
"cfg-if",
"libc",
"miniz_oxide",
"object",
"rustc-demangle",
]
[[package]] [[package]]
name = "bincode" name = "bincode"
version = "1.3.3" version = "1.3.3"
@ -736,6 +763,12 @@ dependencies = [
"wasi", "wasi",
] ]
[[package]]
name = "gimli"
version = "0.27.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
[[package]] [[package]]
name = "glob" name = "glob"
version = "0.3.1" version = "0.3.1"
@ -1128,6 +1161,15 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "object"
version = "0.30.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"
dependencies = [
"memchr",
]
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.17.1" version = "1.17.1"
@ -1449,6 +1491,12 @@ dependencies = [
"smallvec", "smallvec",
] ]
[[package]]
name = "rustc-demangle"
version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
[[package]] [[package]]
name = "rustc_version" name = "rustc_version"
version = "0.4.0" version = "0.4.0"

View File

@ -16,7 +16,7 @@ version = "1.0.0-alpha.2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
anyhow = "1.0.32" anyhow = {version = "1.0.32", features = ["backtrace"]}
async-compression = {version = "0.3.15", features = ["all", "all-algorithms", "tokio"]} async-compression = {version = "0.3.15", features = ["all", "all-algorithms", "tokio"]}
async-stream = "0.3.3" async-stream = "0.3.3"
async-trait = "0.1.64" async-trait = "0.1.64"

View File

@ -143,15 +143,13 @@ pub fn map_exe_error(err: std::io::Error, exe_name: &str, help: &str) -> anyhow:
} }
} }
fn proc_wait(mut child: Child) -> impl AsyncRead { fn proc_wait(mut child: Child, context: impl FnOnce() -> String) -> impl AsyncRead {
let s = stream! { let s = stream! {
let res = child.wait().await?; let res = child.wait().await?;
if res.success() { if res.success() {
yield std::io::Result::Ok(Bytes::new()); yield std::io::Result::Ok(Bytes::new());
} else { } else {
yield std::io::Result::Err(to_io_err( Err(format_err!("{:?}", res)).with_context(context).map_err(to_io_err)?;
format_err!("subprocess failed: {:?}", res),
));
} }
}; };
StreamReader::new(s) StreamReader::new(s)
@ -164,6 +162,7 @@ pub fn pipe_output(
exe_name: &str, exe_name: &str,
help: &str, help: &str,
) -> Result<ReadBox> { ) -> Result<ReadBox> {
let cmd_log = format!("{:?}", cmd); // todo: perf
let mut cmd = cmd let mut cmd = cmd
.stdin(Stdio::piped()) .stdin(Stdio::piped())
.stdout(Stdio::piped()) .stdout(Stdio::piped())
@ -177,10 +176,9 @@ pub fn pipe_output(
tokio::io::copy(&mut z, &mut stdi).await?; tokio::io::copy(&mut z, &mut stdi).await?;
std::io::Result::Ok(()) std::io::Result::Ok(())
}); });
Ok(Box::pin(stdo.chain(
Ok(Box::pin( proc_wait(cmd, move || format!("subprocess: {cmd_log}")).chain(join_handle_to_stream(join)),
stdo.chain(proc_wait(cmd).chain(join_handle_to_stream(join))), )))
))
} }
pub struct CustomSpawningFileAdapter { pub struct CustomSpawningFileAdapter {

View File

@ -77,11 +77,13 @@ fn synchronous_dump_sqlite(ai: AdaptInfo, mut s: impl Write) -> Result<()> {
return Ok(()); return Ok(());
} }
let inp_fname = filepath_hint; let inp_fname = filepath_hint;
let conn = Connection::open_with_flags(&inp_fname, OpenFlags::SQLITE_OPEN_READ_ONLY)
let conn = Connection::open_with_flags(inp_fname, OpenFlags::SQLITE_OPEN_READ_ONLY)?; .with_context(|| format!("opening sqlite connection to {}", inp_fname.display()))?;
let tables: Vec<String> = conn let tables: Vec<String> = conn
.prepare("select name from sqlite_master where type='table'")? .prepare("select name from sqlite_master where type='table'")
.query_map([], |r| r.get::<_, String>(0))? .context("while preparing query")?
.query_map([], |r| r.get::<_, String>(0))
.context("while executing query")?
.filter_map(|e| e.ok()) .filter_map(|e| e.ok())
.collect(); .collect();
debug!("db has {} tables", tables.len()); debug!("db has {} tables", tables.len());
@ -121,7 +123,9 @@ impl WritingFileAdapter for SqliteAdapter {
oup: Pin<Box<dyn AsyncWrite + Send>>, oup: Pin<Box<dyn AsyncWrite + Send>>,
) -> Result<()> { ) -> Result<()> {
let oup_sync = SyncIoBridge::new(oup); let oup_sync = SyncIoBridge::new(oup);
tokio::task::spawn_blocking(|| synchronous_dump_sqlite(ai, oup_sync)).await??; tokio::task::spawn_blocking(|| synchronous_dump_sqlite(ai, oup_sync))
.await?
.context("in synchronous sqlite task")?;
Ok(()) Ok(())
} }
} }

View File

@ -3,7 +3,7 @@ use std::pin::Pin;
use crate::{adapted_iter::one_file, join_handle_to_stream, to_io_err}; use crate::{adapted_iter::one_file, join_handle_to_stream, to_io_err};
use super::{AdaptInfo, FileAdapter, GetMetadata}; use super::{AdaptInfo, FileAdapter, GetMetadata};
use anyhow::Result; use anyhow::{Context, Result};
use async_trait::async_trait; use async_trait::async_trait;
use tokio::io::{AsyncReadExt, AsyncWrite}; use tokio::io::{AsyncReadExt, AsyncWrite};
@ -51,6 +51,7 @@ where
a: super::AdaptInfo, a: super::AdaptInfo,
detection_reason: &crate::matching::FileMatcher, detection_reason: &crate::matching::FileMatcher,
) -> Result<crate::adapted_iter::AdaptedFilesIterBox> { ) -> Result<crate::adapted_iter::AdaptedFilesIterBox> {
let name = self.metadata().name.clone();
let (w, r) = tokio::io::duplex(128 * 1024); let (w, r) = tokio::io::duplex(128 * 1024);
let d2 = detection_reason.clone(); let d2 = detection_reason.clone();
let archive_recursion_depth = a.archive_recursion_depth + 1; let archive_recursion_depth = a.archive_recursion_depth + 1;
@ -60,7 +61,10 @@ where
let config = a.config.clone(); let config = a.config.clone();
let joiner = tokio::spawn(async move { let joiner = tokio::spawn(async move {
let x = d2; let x = d2;
T::adapt_write(a, &x, Box::pin(w)).await.map_err(to_io_err) T::adapt_write(a, &x, Box::pin(w))
.await
.with_context(|| format!("in {}.adapt_write", name))
.map_err(to_io_err)
}); });
Ok(one_file(AdaptInfo { Ok(one_file(AdaptInfo {

View File

@ -43,7 +43,7 @@ async fn main() -> anyhow::Result<()> {
// happens if e.g. ripgrep detects binary data in the pipe so it cancels reading // happens if e.g. ripgrep detects binary data in the pipe so it cancels reading
debug!("output cancelled (broken pipe)"); debug!("output cancelled (broken pipe)");
} else { } else {
Err(e).context("copying adapter output to stdout {}")?; Err(e).context("copying adapter output to stdout")?;
} }
} }
debug!("running adapter took {} total", print_dur(start)); debug!("running adapter took {} total", print_dur(start));