fixup! feat: standardize logs

cartesi · Aug 29, 2023 · 4137af0 · 4137af0
1 parent e9a9c23
commit 4137af0
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 14 deletions.
diff --git a/offchain/advance-runner/Cargo.toml b/offchain/advance-runner/Cargo.toml
@@ -11,8 +11,8 @@ path = "src/main.rs"
 [dependencies]
 grpc-interfaces = { path = "../grpc-interfaces" }
 http-health-check = { path = "../http-health-check" }
+logs = { path = "../logs" }
 rollups-events = { path = "../rollups-events" }
-logs = {path = "../logs"}
 
 async-trait.workspace = true
 backoff = { workspace = true, features = ["tokio"] }

diff --git a/offchain/authority-claimer/Cargo.toml b/offchain/authority-claimer/Cargo.toml
@@ -11,8 +11,8 @@ test = false
 
 [dependencies]
 http-server = { path = "../http-server" }
-rollups-events = { path = "../rollups-events" }
 logs = { path = "../logs" }
+rollups-events = { path = "../rollups-events" }
 
 async-trait.workspace = true
 clap = { workspace = true, features = ["derive", "env"] }

diff --git a/offchain/authority-claimer/src/main.rs b/offchain/authority-claimer/src/main.rs
@@ -10,7 +10,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     // Getting the configuration.
     let config: Config = Config::new().map_err(Box::new)?;
 
-    // Settin up the logging environment.
+    // Setting up the logging environment.
     logs::configure(&config.authority_claimer_config.logs_config);
 
     info!(?config, "Starting Authority Claimer");

diff --git a/offchain/dispatcher/Cargo.toml b/offchain/dispatcher/Cargo.toml
@@ -11,9 +11,9 @@ path = "src/main.rs"
 [dependencies]
 contracts = { path = "../contracts" }
 http-server = { path = "../http-server" }
+logs = { path = "../logs" }
 rollups-events = { path = "../rollups-events" }
 types = { path = "../types" }
-logs = {path = "../logs"} 
 
 async-trait.workspace = true
 axum.workspace = true

diff --git a/offchain/graphql-server/Cargo.toml b/offchain/graphql-server/Cargo.toml
@@ -14,8 +14,8 @@ path = "src/schema/generate_schema.rs"
 
 [dependencies]
 http-health-check = { path = "../http-health-check" }
-rollups-data = { path = "../data" }
 logs = { path = "../logs" }
+rollups-data = { path = "../data" }
 
 actix-cors.workspace = true
 actix-web.workspace = true

diff --git a/offchain/indexer/Cargo.toml b/offchain/indexer/Cargo.toml
@@ -11,9 +11,9 @@ test = false
 
 [dependencies]
 http-health-check = { path = "../http-health-check" }
+logs = { path = "../logs" }
 rollups-data = { path = "../data" }
 rollups-events = { path = "../rollups-events" }
-logs = {path = "../logs"}
 
 chrono.workspace = true
 clap = { workspace = true, features = ["derive", "env"] }

diff --git a/offchain/inspect-server/Cargo.toml b/offchain/inspect-server/Cargo.toml
@@ -12,8 +12,6 @@ path = "src/main.rs"
 http-health-check = { path = "../http-health-check" }
 logs = { path = "../logs" }
 
-
-
 actix-cors.workspace = true
 actix-web.workspace = true
 clap = { workspace = true, features = ["derive", "env"] }

diff --git a/offchain/logs/Cargo.toml b/offchain/logs/Cargo.toml
@@ -1,11 +1,10 @@
 [package]
 name = "logs"
-version = "1.0.0"
-edition = "2021"
-license = "Apache-2.0"
+edition.workspace = true
+license.workspace = true
+version.workspace = true
 
 [dependencies]
 clap = { workspace = true, features = ["derive", "env"] }
 tracing.workspace = true
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
-
diff --git a/offchain/logs/src/lib.rs b/offchain/logs/src/lib.rs
@@ -21,7 +21,6 @@ pub struct LogsConfig {
 impl LogsConfig {
     pub fn initialize(env_cli_config: LogsEnvCliConfig) -> Self {
         let enable_timestamp = env_cli_config.logs_enable_timestamp;
-
         let enable_color = env_cli_config.logs_enable_color;
 
         LogsConfig {

diff --git a/offchain/state-server/src/config.rs b/offchain/state-server/src/config.rs
@@ -1,8 +1,8 @@
 use clap::Parser;
-use logs::{LogsConfig, LogsEnvCliConfig};
 use eth_state_server_lib::config::{
     Result, StateServerConfig, StateServerEnvCLIConfig,
 };
+use logs::{LogsConfig, LogsEnvCliConfig};
 
 #[derive(Debug, Clone, Parser)]
 #[command(name = "sate_server_config")]