Update dependencies

This commit is contained in:
Dominik Werder
2023-06-13 11:40:00 +02:00
parent 917e96584d
commit 01b847d70c
3 changed files with 172 additions and 380 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -9,7 +9,6 @@ pub fn main() -> Result<(), Error> {
// TODO offer again function to get runtime and configure tracing in one call
let runtime = taskrun::get_runtime_opts(opts.nworkers.unwrap_or(12), 32);
taskrun::tracing_init().unwrap();
info!("daqingest version {}", clap::crate_version!());
let res = runtime.block_on(async move {
use daqingest::opts::ChannelAccess;
use daqingest::opts::SubCmd;
@@ -26,19 +25,18 @@ pub fn main() -> Result<(), Error> {
}
SubCmd::ChannelAccess(k) => match k {
ChannelAccess::CaSearch(k) => {
info!("daqingest version {}", clap::crate_version!());
let (conf, channels) = parse_config(k.config.into()).await?;
netfetch::ca::search::ca_search(conf, &channels).await?
}
ChannelAccess::CaIngest(k) => {
info!("daqingest version {}", clap::crate_version!());
let (conf, channels) = parse_config(k.config.into()).await?;
daqingest::daemon::run(conf, channels).await?
}
},
SubCmd::Logappend(k) => {
let jh = tokio::task::spawn_blocking(move || {
taskrun::append::append(&k.dir, k.total_size_max_bytes(), std::io::stdin()).unwrap();
});
jh.await.map_err(Error::from_string)?;
SubCmd::Version => {
println!("{}", clap::crate_version!());
}
}
Ok(())

View File

@@ -26,7 +26,7 @@ pub enum SubCmd {
BsreadDump(BsreadDump),
#[command(subcommand)]
ChannelAccess(ChannelAccess),
Logappend(Logappend),
Version,
}
#[derive(Debug, Parser)]
@@ -88,17 +88,3 @@ pub struct CaSearch {
pub struct CaConfig {
pub config: String,
}
#[derive(Debug, Parser)]
pub struct Logappend {
#[arg(long)]
pub dir: String,
#[arg(long)]
pub total_mb: Option<u64>,
}
impl Logappend {
pub fn total_size_max_bytes(&self) -> u64 {
1024 * 1024 * self.total_mb.unwrap_or(20)
}
}