Rebase split library to latest main

dora-rs · Jul 26, 2024 · edf22da · edf22da
1 parent cfcb5d2
commit edf22da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/binaries/cli/src/lib.rs b/binaries/cli/src/lib.rs
@@ -48,7 +48,7 @@ struct Args {
 
 /// dora-rs cli client
 #[derive(Debug, clap::Subcommand)]
-enum Command {
+pub enum Command {
     /// Check if the coordinator and the daemon is running.
     Check {
         /// Path to the dataflow descriptor file (enables additional checks)
@@ -248,7 +248,7 @@ enum Lang {
     Cxx,
 }
 
-fn run(command: Command) -> eyre::Result<()> {
+pub fn run(command: Command) -> eyre::Result<()> {
     let log_level = env_logger::Builder::new()
         .filter_level(log::LevelFilter::Info)
         .parse_default_env()

diff --git a/binaries/cli/src/main.rs b/binaries/cli/src/main.rs
@@ -1,11 +1,13 @@
 use clap::Parser;
-use dora_cli::Command;
+use colored::Colorize;
+use dora_cli::{run, Command};
 #[cfg(feature = "tracing")]
 use dora_tracing::set_up_tracing;
+use dora_tracing::set_up_tracing_opts;
 use eyre::Context;
 
 fn main() {
-    if let Err(err) = run() {
+    if let Err(err) = main_inner() {
         eprintln!("\n\n{}", "[ERROR]".bold().red());
         eprintln!("{err:#}");
         std::process::exit(1);
@@ -48,5 +50,5 @@ fn main_inner() -> eyre::Result<()> {
         }
     };
 
-    dora_cli::run(args.command)
+    run(args.command)
 }