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

Move backend config key

Browse Source
This commit is contained in:
Dominik Werder
2022-02-21 18:33:36 +01:00
parent 88478f455d
commit 2b49d67eed
9 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netpod/src/netpod.rs
View File

@@ -224,7 +224,6 @@ pub struct Node {
pub port: u16,
pub port_raw: u16,
pub cache_base_path: PathBuf,
pub backend: String,
pub sf_databuffer: Option<SfDatabuffer>,
pub archiver_appliance: Option<ArchiverAppliance>,
pub channel_archiver: Option<ChannelArchiver>,
@@ -239,7 +238,6 @@ impl Node {
port: 4444,
port_raw: 4444,
cache_base_path: PathBuf::new(),
backend: "dummybackend".into(),
sf_databuffer: Some(SfDatabuffer {
data_base_path: PathBuf::new(),
ksprefix: "daqlocal".into(),
@@ -261,6 +259,7 @@ pub struct Database {
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct Cluster {
pub backend: String,
pub nodes: Vec<Node>,
pub database: Database,
#[serde(rename = "runMapPulse", default)]
@@ -1513,7 +1512,6 @@ pub fn test_cluster() -> Cluster {
port: 6170 + id as u16,
port_raw: 6170 + id as u16 + 100,
cache_base_path: test_data_base_path_databuffer().join(format!("node{:02}", id)),
backend: "testbackend".into(),
sf_databuffer: Some(SfDatabuffer {
data_base_path: test_data_base_path_databuffer().join(format!("node{:02}", id)),
ksprefix: "ks".into(),
@@ -1524,6 +1522,7 @@ pub fn test_cluster() -> Cluster {
})
.collect();
Cluster {
backend: "testbackend".into(),
nodes,
database: Database {
host: "127.0.0.1".into(),
@@ -1546,7 +1545,6 @@ pub fn sls_test_cluster() -> Cluster {
port: 6190 + id as u16,
port_raw: 6190 + id as u16 + 100,
cache_base_path: test_data_base_path_databuffer().join(format!("node{:02}", id)),
backend: "sls-archive".into(),
sf_databuffer: None,
archiver_appliance: None,
channel_archiver: Some(ChannelArchiver {
@@ -1555,6 +1553,7 @@ pub fn sls_test_cluster() -> Cluster {
})
.collect();
Cluster {
backend: "sls-archive".into(),
nodes,
database: Database {
host: "127.0.0.1".into(),
@@ -1577,7 +1576,6 @@ pub fn archapp_test_cluster() -> Cluster {
port: 6200 + id as u16,
port_raw: 6200 + id as u16 + 100,
cache_base_path: test_data_base_path_databuffer().join(format!("node{:02}", id)),
backend: "sf-archive".into(),
sf_databuffer: None,
channel_archiver: None,
archiver_appliance: Some(ArchiverAppliance {
@@ -1586,6 +1584,7 @@ pub fn archapp_test_cluster() -> Cluster {
})
.collect();
Cluster {
backend: "sf-archive".into(),
nodes,
database: Database {
host: "127.0.0.1".into(),