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

Remove unnecessary parameter

Browse Source
This commit is contained in:
Dominik Werder
2022-09-09 07:23:56 +02:00
parent 62a1be0c4b
commit c63c5c7d5e
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dbconn/src/events_scylla.rs
View File

@@ -578,7 +578,6 @@ pub async fn make_scylla_stream(
pub async fn channel_state_events(
evq: &ChannelStateEventsQuery,
scyco: &ScyllaConfig,
_dbconf: Database,
) -> Result<Vec<(u64, u32)>, Error> {
let scy = scylla::SessionBuilder::new()
.known_nodes(&scyco.hosts)

7
httpret/src/channel_status.rs
View File

@@ -1,6 +1,5 @@
use crate::bodystream::response;
use crate::err::Error;
use dbconn::events_scylla::channel_state_events;
use http::{Method, Request, Response, StatusCode};
use hyper::Body;
use netpod::query::ChannelStateEventsQuery;
@@ -49,14 +48,13 @@ impl ConnectionStatusEvents {
q: &ChannelStateEventsQuery,
node_config: &NodeConfigCached,
) -> Result<Vec<(u64, u32)>, Error> {
let dbconf = &node_config.node_config.cluster.database;
let scyco = node_config
.node_config
.cluster
.scylla
.as_ref()
.ok_or_else(|| Error::with_public_msg_no_trace(format!("No Scylla configured")))?;
let ret = channel_state_events(q, scyco, dbconf.clone()).await?;
let ret = dbconn::events_scylla::channel_state_events(q, scyco).await?;
Ok(ret)
}
}
@@ -103,14 +101,13 @@ impl ChannelConnectionStatusEvents {
q: &ChannelStateEventsQuery,
node_config: &NodeConfigCached,
) -> Result<Vec<(u64, u32)>, Error> {
let dbconf = &node_config.node_config.cluster.database;
let scyco = node_config
.node_config
.cluster
.scylla
.as_ref()
.ok_or_else(|| Error::with_public_msg_no_trace(format!("No Scylla configured")))?;
let ret = channel_state_events(q, scyco, dbconf.clone()).await?;
let ret = dbconn::events_scylla::channel_state_events(q, scyco).await?;
Ok(ret)
}
}