diff --git a/crates/daqbuffer/src/fetch.rs b/crates/daqbuffer/src/fetch.rs index 62f8fdf..b64eef4 100644 --- a/crates/daqbuffer/src/fetch.rs +++ b/crates/daqbuffer/src/fetch.rs @@ -8,14 +8,13 @@ use httpclient::body_empty; use httpclient::connect_client; use httpclient::http; use httpclient::http::StatusCode; -use httpclient::http_body_util::BodyExt; use httpclient::hyper::Request; use httpclient::IncomingStream; use netpod::log::*; use netpod::ScalarType; use netpod::Shape; use netpod::APP_CBOR_FRAMED; -use streams::cbor::FramedBytesToSitemtyDynEventsStream; +use streams::cbor_stream::FramedBytesToSitemtyDynEventsStream; use url::Url; #[derive(Debug, ThisError)] diff --git a/crates/dbconn/src/dbconn.rs b/crates/dbconn/src/dbconn.rs index 940f842..9ac9823 100644 --- a/crates/dbconn/src/dbconn.rs +++ b/crates/dbconn/src/dbconn.rs @@ -20,9 +20,7 @@ use err::ThisError; use netpod::log::*; use netpod::Database; use netpod::NodeConfigCached; -use netpod::ScalarType; use netpod::SfDbChannel; -use netpod::Shape; use netpod::TableSizes; use pg::Client as PgClient; use pg::NoTls; diff --git a/crates/httpret/src/proxy/api4/backend.rs b/crates/httpret/src/proxy/api4/backend.rs index 7b7854b..85abaa2 100644 --- a/crates/httpret/src/proxy/api4/backend.rs +++ b/crates/httpret/src/proxy/api4/backend.rs @@ -25,7 +25,14 @@ impl BackendListHandler { if req.method() == Method::GET { if accepts_json_or_all(req.headers()) { let res = serde_json::json!({ - "backends_available": ["sf-databuffer"] + "backends_available": [ + { + "name": "sf-databuffer", + }, + { + "name": "sf-imagebuffer", + }, + ] }); let body = serde_json::to_string(&res)?; Ok(response(StatusCode::OK).body(body_string(body))?) diff --git a/crates/nodenet/src/configquorum.rs b/crates/nodenet/src/configquorum.rs index d62b8c6..682b5fe 100644 --- a/crates/nodenet/src/configquorum.rs +++ b/crates/nodenet/src/configquorum.rs @@ -92,6 +92,7 @@ pub async fn find_config_basics_quorum( ctx: &ReqCtx, ncc: &NodeConfigCached, ) -> Result, Error> { + trace!("find_config_basics_quorum"); if let Some(_cfg) = &ncc.node.sf_databuffer { let channel = if channel.name().is_empty() { if let Some(_) = channel.series() { diff --git a/crates/streams/src/cbor.rs b/crates/streams/src/cbor_stream.rs similarity index 100% rename from crates/streams/src/cbor.rs rename to crates/streams/src/cbor_stream.rs diff --git a/crates/streams/src/firsterr.rs b/crates/streams/src/firsterr.rs index 7d04d37..a002b9a 100644 --- a/crates/streams/src/firsterr.rs +++ b/crates/streams/src/firsterr.rs @@ -1,4 +1,4 @@ -use crate::cbor::CborBytes; +use crate::cbor_stream::CborBytes; use futures_util::future; use futures_util::Stream; use futures_util::StreamExt; diff --git a/crates/streams/src/json_stream.rs b/crates/streams/src/json_stream.rs index 77b6f18..c4d2d51 100644 --- a/crates/streams/src/json_stream.rs +++ b/crates/streams/src/json_stream.rs @@ -1,4 +1,4 @@ -use crate::cbor::SitemtyDynEventsStream; +use crate::cbor_stream::SitemtyDynEventsStream; use bytes::Bytes; use err::Error; use futures_util::Stream; diff --git a/crates/streams/src/lib.rs b/crates/streams/src/lib.rs index 753329c..1449949 100644 --- a/crates/streams/src/lib.rs +++ b/crates/streams/src/lib.rs @@ -1,5 +1,5 @@ pub mod boxed; -pub mod cbor; +pub mod cbor_stream; pub mod collect; pub mod dtflags; pub mod filechunkread; diff --git a/crates/streams/src/plaineventscbor.rs b/crates/streams/src/plaineventscbor.rs index 68050d2..356fefb 100644 --- a/crates/streams/src/plaineventscbor.rs +++ b/crates/streams/src/plaineventscbor.rs @@ -1,5 +1,5 @@ -use crate::cbor::events_stream_to_cbor_stream; -use crate::cbor::CborStream; +use crate::cbor_stream::events_stream_to_cbor_stream; +use crate::cbor_stream::CborStream; use crate::firsterr::non_empty; use crate::firsterr::only_first_err; use crate::plaineventsstream::dyn_events_stream; diff --git a/crates/streams/src/test/events.rs b/crates/streams/src/test/events.rs index 297b4f3..5ee66a2 100644 --- a/crates/streams/src/test/events.rs +++ b/crates/streams/src/test/events.rs @@ -1,4 +1,4 @@ -use crate::cbor::FramedBytesToSitemtyDynEventsStream; +use crate::cbor_stream::FramedBytesToSitemtyDynEventsStream; use crate::firsterr::only_first_err; use crate::frames::inmem::BoxedBytesStream; use crate::lenframed;