Skip to content

Commit

Permalink
fix: add details to UnknownError (#3429)
Browse files Browse the repository at this point in the history
Description
---
This PR adds (requires) details to `UnknownError`.

Motivation and Context
---
Related to #3423 
Without the fix some errors are indiscernible. Example:

```sh
     Running `target/debug/tari_base_node`
Initializing logging according to "/home/denis/.tari/config/log4rs_base_node.yml"
10:47 ERROR Network discovery errored: Connectivity error:
    Internal actor response was unexpectedly cancelled. Waiting for 5s
10:47 ERROR DhtConnectivity exited with error: ConnectivityError(ActorDisconnected)
UnknownError
10:47 ERROR Exiting with code (102): UnknownError
```

With the fix:

```sh
     Running `target/debug/tari_base_node`
Initializing logging according to "/home/denis/.tari/config/log4rs_base_node.yml"
10:48 ERROR Network discovery errored: Connectivity error:
    Internal actor response was unexpectedly cancelled. Waiting for 5s
UnknownError("Failed to initialize tor hidden service: TorClientError: Command failed:
    Authentication failed: Wrong length on authentication cookie.")
10:48 ERROR Exiting with code (102): UnknownError("Failed to initialize tor
    hidden service: TorClientError: Command failed: Authentication failed:
    Wrong length on authentication cookie.")
```

How Has This Been Tested?
---
Manually by activating **CookieAuthentication 1** option in the Tor's settings.
  • Loading branch information
therustmonk committed Oct 8, 2021
1 parent 1e78903 commit dddc18f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
6 changes: 3 additions & 3 deletions applications/tari_app_utilities/src/utilities.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ pub const LOG_TARGET: &str = "tari::application";
pub enum ExitCodes {
#[error("There is an error in the wallet configuration: {0}")]
ConfigError(String),
#[error("The application exited because an unknown error occurred. Check the logs for details.")]
UnknownError,
#[error("The application exited because an unknown error occurred: {0}. Check the logs for more details.")]
UnknownError(String),
#[error("The application exited because an interface error occurred. Check the logs for details.")]
InterfaceError,
#[error("The application exited. {0}")]
Expand Down Expand Up @@ -86,7 +86,7 @@ impl ExitCodes {
pub fn as_i32(&self) -> i32 {
match self {
Self::ConfigError(_) => 101,
Self::UnknownError => 102,
Self::UnknownError(_) => 102,
Self::InterfaceError => 103,
Self::WalletError(_) => 104,
Self::GrpcError(_) => 105,
Expand Down
4 changes: 2 additions & 2 deletions applications/tari_base_node/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ fn main_inner() -> Result<(), ExitCodes> {
// Set up the Tokio runtime
let rt = setup_runtime(&node_config).map_err(|e| {
error!(target: LOG_TARGET, "{}", e);
ExitCodes::UnknownError
ExitCodes::UnknownError(e)
})?;

rt.block_on(run_node(node_config.into(), bootstrap))?;
Expand Down Expand Up @@ -222,7 +222,7 @@ async fn run_node(node_config: Arc<GlobalConfig>, bootstrap: ConfigBootstrap) ->
return ExitCodes::ConfigError(boxed_error.to_string());
}
}
ExitCodes::UnknownError
ExitCodes::UnknownError(err.to_string())
})?;

if node_config.grpc_enabled {
Expand Down
7 changes: 4 additions & 3 deletions applications/tari_base_node/src/recovery.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,13 @@ pub fn initiate_recover_db(node_config: &GlobalConfig) -> Result<(), ExitCodes>
DatabaseType::LMDB(p) => {
let _backend = create_recovery_lmdb_database(&p).map_err(|err| {
error!(target: LOG_TARGET, "{}", err);
ExitCodes::UnknownError
ExitCodes::UnknownError(err.to_string())
})?;
},
_ => {
error!(target: LOG_TARGET, "Recovery mode is only available for LMDB");
return Err(ExitCodes::UnknownError);
const MSG: &str = "Recovery mode is only available for LMDB";
error!(target: LOG_TARGET, "{}", MSG);
return Err(ExitCodes::UnknownError(MSG.to_string()));
},
};
Ok(())
Expand Down

0 comments on commit dddc18f

Please sign in to comment.