daqbuf/daqbuffer
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP add thiserror, anyhow

Browse Source
This commit is contained in:
Dominik Werder
2023-03-31 10:22:46 +02:00
parent a2e17848ba
commit 7c9085fe5b
9 changed files with 1185 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
httpret/src/api4/binned.rs
View File

@@ -3,6 +3,7 @@ use crate::bodystream::ToPublicResponse;
use crate::channelconfig::chconf_from_binned;
use crate::err::Error;
use crate::response_err;
use err::anyhow::Context;
use http::Method;
use http::Request;
use http::Response;
@@ -30,7 +31,7 @@ async fn binned_json(url: Url, req: Request<Body>, node_config: &NodeConfigCache
let chconf = chconf_from_binned(&query, node_config).await?;
// Update the series id since we don't require some unique identifier yet.
let mut query = query;
query.set_series_id(chconf.try_series()?);
query.set_series_id(chconf.try_series().context("binned_json")?);
let query = query;
// ---
let span1 = span!(

5
httpret/src/api4/events.rs
View File

@@ -4,6 +4,7 @@ use crate::response;
use crate::response_err;
use crate::BodyStream;
use crate::ToPublicResponse;
use err::anyhow::Context;
use futures_util::stream;
use futures_util::TryStreamExt;
use http::Method;
@@ -78,7 +79,7 @@ async fn plain_events_binary(
info!("plain_events_binary chconf_from_events_v1: {chconf:?}");
// Update the series id since we don't require some unique identifier yet.
let mut query = query;
query.set_series_id(chconf.try_series()?);
query.set_series_id(chconf.try_series().context("plain_events_binary")?);
let query = query;
// ---
let _ = query;
@@ -103,7 +104,7 @@ async fn plain_events_json(
info!("plain_events_json chconf_from_events_v1: {chconf:?}");
// Update the series id since we don't require some unique identifier yet.
let mut query = query;
query.set_series_id(chconf.try_series()?);
query.set_series_id(chconf.try_series().context("plain_events_json")?);
let query = query;
// ---
//let query = RawEventsQuery::new(query.channel().clone(), query.range().clone(), AggKind::Plain);

3
httpret/src/channel_status.rs
View File

@@ -1,6 +1,7 @@
use crate::bodystream::response;
use crate::err::Error;
use crate::ReqCtx;
use err::anyhow::Context;
use futures_util::StreamExt;
use http::Method;
use http::Request;
@@ -153,7 +154,7 @@ impl ChannelStatusEvents {
nodenet::channelconfig::channel_config(q.range().clone(), q.channel().clone(), node_config).await?;
let do_one_before_range = true;
let mut stream = scyllaconn::status::StatusStreamScylla::new(
chconf.try_series()?,
chconf.try_series().context("channel_status")?,
q.range().clone(),
do_one_before_range,
scy,

1
httpret/src/err.rs
View File

@@ -92,3 +92,4 @@ impl Convable for http::Error {}
impl Convable for http::header::ToStrError {}
impl Convable for hyper::Error {}
impl Convable for std::array::TryFromSliceError {}
impl Convable for err::anyhow::Error {}