Merge pull request #547 from shaneikennedy/command-error-handling

Author: shortishly

Cargo.lock

@@ -122,26 +122,10 @@ impl Cli {
         let cli = Cli::parse();
 
         match cli.command.unwrap_or(Command::Broker(Box::new(cli.broker))) {
-            Command::Broker(arg) => arg
-                .main()
-                .await
-                .inspect(|result| debug!(?result))
-                .inspect_err(|err| debug!(?err)),
-
+            Command::Broker(arg) => arg.main().await,
             Command::Cat { command } => command.main().await,
-
-            Command::Generator(arg) => arg
-                .main()
-                .await
-                .inspect(|result| debug!(?result))
-                .inspect_err(|err| debug!(?err)),
-
-            Command::Perf(arg) => arg
-                .main()
-                .await
-                .inspect(|result| debug!(?result))
-                .inspect_err(|err| debug!(?err)),
-
+            Command::Generator(arg) => arg.main().await,
+            Command::Perf(arg) => arg.main().await,
             Command::Proxy(arg) => tansu_proxy::Proxy::main(
                 arg.listener_url.into_inner(),
                 arg.advertised_listener_url.into_inner(),
@@ -151,7 +135,6 @@ impl Cli {
             )
             .await
             .map_err(Into::into),
-
             Command::Topic { command } => command.main().await,
         }
     }

tansu-cli/src/cli.rs

@@ -18,7 +18,6 @@ use crate::Result;
 use clap::Subcommand;
 use tansu_sans_io::ErrorCode;
 use tansu_topic::Topic;
-use tracing::{debug, error, info};
 use url::Url;
 
 use super::DEFAULT_BROKER;
@@ -84,32 +83,9 @@ impl From<Command> for Topic {
     }
 }
 
-const CLIENT_ERROR_MESSAGE: &str = "A client error occurred. Possible causes:
-  • No network connection
-  • The server is down or unreachable
-  • Incorrect hostname or port
-  • Firewall or proxy blocking the connection
-  • TLS/SSL certificate issues (if applicable)
-
-Check your internet connection, verify the server address, and try again.";
-
 impl Command {
     pub(super) async fn main(self) -> Result<ErrorCode> {
-        Topic::from(self)
-            .main()
-            .await
-            .map_err(Into::into)
-            .inspect(|res| match res {
-                ErrorCode::None => info!("Topic command exited successfully."),
-                _ => error!("{}", res),
-            })
-            .inspect_err(|e| match e {
-                crate::Error::Topic(error) => match error {
-                    tansu_topic::Error::Client(_) => error!("{}", CLIENT_ERROR_MESSAGE),
-                    _ => error!("Unknown error occurred during command: {}", error),
-                },
-                _ => debug!(?e),
-            })
+        Topic::from(self).main().await.map_err(Into::into)
     }
 }
 

tansu-cli/src/cli/topic.rs

@@ -16,10 +16,15 @@ workspace = true
 [dependencies]
 dotenv.workspace = true
 tansu-broker = { workspace = true, default-features = false, optional = true }
+tansu-cat.workspace = true
 tansu-cli = { workspace = true, default-features = false, optional = true }
+tansu-generator.workspace = true
+tansu-perf.workspace = true
+tansu-proxy.workspace = true
 tansu-sans-io.workspace = true
 tansu-schema = { workspace = true, default-features = false, optional = true }
 tansu-storage = { workspace = true, default-features = false, optional = true }
+tansu-topic.workspace = true
 tokio.workspace = true
 tracing.workspace = true
 

tansu/Cargo.toml

@@ -18,6 +18,15 @@ use tansu_cli::{Cli, Result};
 use tansu_sans_io::ErrorCode;
 use tracing::{debug, error};
 
+const CLIENT_ERROR_MESSAGE: &str = "A client error occurred. Possible causes:
+  • No network connection
+  • The server is down or unreachable
+  • Incorrect hostname or port
+  • Firewall or proxy blocking the connection
+  • TLS/SSL certificate issues (if applicable)
+
+Check your internet connection, verify the server address, and try again.";
+
 #[tokio::main]
 async fn main() -> Result<ErrorCode> {
     _ = dotenv().ok();
@@ -26,6 +35,31 @@ async fn main() -> Result<ErrorCode> {
 
     Cli::main()
         .await
-        .inspect(|error_code| debug!(%error_code))
-        .inspect_err(|err| error!(%err))
+        .inspect(|error_code| match error_code {
+            ErrorCode::None => debug!("{}", error_code),
+            _ => error!("{}", error_code),
+        })
+        .inspect_err(|err| match err {
+            tansu_cli::Error::Cat(error) => match &**error {
+                tansu_cat::Error::Client(_) => error!("{}", CLIENT_ERROR_MESSAGE),
+                _ => error!("Unknown error occurred during command: {}", error),
+            },
+            tansu_cli::Error::Generate(error) => match error {
+                tansu_generator::Error::Client(_) => error!("{}", CLIENT_ERROR_MESSAGE),
+                _ => error!("Unknown error occurred during command: {}", error),
+            },
+            tansu_cli::Error::Perf(error) => match error {
+                tansu_perf::Error::Client(_) => error!("{}", CLIENT_ERROR_MESSAGE),
+                _ => error!("Unknown error occurred during command: {}", error),
+            },
+            tansu_cli::Error::Proxy(error) => match error {
+                tansu_proxy::Error::Client(_) => error!("{}", CLIENT_ERROR_MESSAGE),
+                _ => error!("Unknown error occurred during command: {}", error),
+            },
+            tansu_cli::Error::Topic(error) => match error {
+                tansu_topic::Error::Client(_) => error!("{}", CLIENT_ERROR_MESSAGE),
+                _ => error!("Unknown error occurred during command: {}", error),
+            },
+            _ => error!("Unknown error occurred during command: {}", err),
+        })
 }