Rename project

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = ["retrieval"]
+members = ["daqbuffer"]
 
 [profile.release]
 debug = 1

daqbuffer/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
-name = "retrieval"
+name = "daqbuffer"
-version = "0.0.1-a.0"
+version = "4.0.0-a.dev.12"
 authors = ["Dominik Werder <dominik.werder@gmail.com>"]
 edition = "2018"
 

daqbuffer/src/bin/daqbuffer.rs

@@ -4,6 +4,7 @@ use err::Error;
 use netpod::log::*;
 use netpod::{NodeConfig, NodeConfigCached};
 use tokio::io::AsyncReadExt;
+use tokio::fs::File;
 
 pub fn main() {
     match taskrun::run(go()) {
@@ -45,30 +46,30 @@ fn parse_ts(s: &str) -> Result<DateTime<Utc>, Error> {
 
 async fn go() -> Result<(), Error> {
     use clap::Clap;
-    use retrieval::cli::{ClientType, Opts, SubCmd};
+    use daqbuffer::cli::{ClientType, Opts, SubCmd};
     let opts = Opts::parse();
     match opts.subcmd {
         SubCmd::Retrieval(subcmd) => {
-            trace!("testout");
+            trace!("test trace");
-            info!("testout");
+            error!("test error");
-            error!("testout");
+            info!("daqbuffer {}", clap::crate_version!());
-            let mut config_file = tokio::fs::File::open(subcmd.config).await?;
+            let mut config_file = File::open(subcmd.config).await?;
             let mut buf = vec![];
             config_file.read_to_end(&mut buf).await?;
             let node_config: NodeConfig = serde_json::from_slice(&buf)?;
             let node_config: Result<NodeConfigCached, Error> = node_config.into();
             let node_config = node_config?;
-            retrieval::run_node(node_config.clone()).await?;
+            daqbuffer::run_node(node_config.clone()).await?;
         }
         SubCmd::Client(client) => match client.client_type {
             ClientType::Status(opts) => {
-                retrieval::client::status(opts.host, opts.port).await?;
+                daqbuffer::client::status(opts.host, opts.port).await?;
             }
             ClientType::Binned(opts) => {
                 let beg = parse_ts(&opts.beg)?;
                 let end = parse_ts(&opts.end)?;
                 let cache_usage = CacheUsage::from_string(&opts.cache)?;
-                retrieval::client::get_binned(
+                daqbuffer::client::get_binned(
                     opts.host,
                     opts.port,
                     opts.backend,

daqbuffer/src/cli.rs

@@ -1,7 +1,7 @@
 use clap::{crate_version, Clap};
 
 #[derive(Debug, Clap)]
-#[clap(name="retrieval", author="Dominik Werder <dominik.werder@gmail.com>", version=crate_version!())]
+#[clap(name="daqbuffer", author="Dominik Werder <dominik.werder@gmail.com>", version=crate_version!())]
 pub struct Opts {
     #[clap(short, long, parse(from_occurrences))]
     pub verbose: i32,

taskrun/src/lib.rs

@@ -63,7 +63,7 @@ pub fn tracing_init() {
             .with_thread_names(true)
             //.with_max_level(tracing::Level::INFO)
             .with_env_filter(tracing_subscriber::EnvFilter::new(
-                "info,retrieval=trace,retrieval::test=trace,disk::raw::conn=info",
+                "info,daqbuffer=trace,daqbuffer::test=trace,disk::raw::conn=info",
             ))
             .init();
         *g = 1;