diff --git a/crates/daqbuffer/Cargo.toml b/crates/daqbuffer/Cargo.toml index 71c61e1..34f7cbc 100644 --- a/crates/daqbuffer/Cargo.toml +++ b/crates/daqbuffer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "daqbuffer" -version = "0.5.5-aa.8" +version = "0.5.5-aa.9" authors = ["Dominik Werder "] edition = "2021" diff --git a/crates/httpret/src/api4/binned.rs b/crates/httpret/src/api4/binned.rs index e2d5b3b..c860cef 100644 --- a/crates/httpret/src/api4/binned.rs +++ b/crates/httpret/src/api4/binned.rs @@ -232,7 +232,7 @@ async fn binned_json_single( ) -> Result { // TODO unify with binned_json_framed debug!("binned_json_single"); - let item = streams::timebinnedjson::timebinned_json( + let res = streams::timebinnedjson::timebinned_json( res2.query, res2.ch_conf, ctx, @@ -241,7 +241,7 @@ async fn binned_json_single( res2.timeout_provider, ) .await?; - match item { + match res { CollectResult::Some(item) => { let ret = response(StatusCode::OK) .header(CONTENT_TYPE, APP_JSON) @@ -249,10 +249,14 @@ async fn binned_json_single( .body(ToJsonBody::from(item.into_bytes()).into_body())?; Ok(ret) } + CollectResult::Empty => { + let ret = error_status_response(StatusCode::NO_CONTENT, format!("no content"), ctx.reqid()); + Ok(ret) + } CollectResult::Timeout => { let ret = error_status_response( StatusCode::GATEWAY_TIMEOUT, - format!("no data within timeout"), + format!("no content within timeout"), ctx.reqid(), ); Ok(ret) diff --git a/crates/httpret/src/api4/events.rs b/crates/httpret/src/api4/events.rs index 8d87214..b037031 100644 --- a/crates/httpret/src/api4/events.rs +++ b/crates/httpret/src/api4/events.rs @@ -240,10 +240,14 @@ async fn plain_events_json(req: Requ, res2: HandleRes2<'_>) -> Result { + let ret = error_status_response(StatusCode::NO_CONTENT, format!("no content"), res2.ctx.reqid()); + Ok(ret) + } CollectResult::Timeout => { let ret = error_status_response( StatusCode::GATEWAY_TIMEOUT, - format!("no data within timeout"), + format!("no content within timeout"), res2.ctx.reqid(), ); Ok(ret)