Skip to content

Commit dc171c1

Browse files
committed
Merge torrust#888: Move from log to tracing crate
ec88dbf chore(deps): remove unused dependencies log and fern (Jose Celano) d6fd11a test: [torrust#884] add test for parsing array of services from app logs (Jose Celano) 7de2595 chore(deps): [torrust#884] remove unused crate log (Jose Celano) 69f100a refactor: [torrust#884] move from log to tracing crate (Jose Celano) 6e06b2e refactor: [torrust#884] move from log to tracing crate (Jose Celano) 3ccc0e4 chore(deps): add cargo dependency tracing (Jose Celano) Pull request description: Move from `log` to `tracing` crate. ACKs for top commit: josecelano: ACK ec88dbf Tree-SHA512: ce468cc920555f821067d24d7a4ca23313f521ad01faaf8e34c1d581bdf43c9a83a9ef3119ab5adf1d4d265befcfe1100cee7ce1e52d67ddabbf342b7b52713a
2 parents 613a1df + ec88dbf commit dc171c1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+262
-164
lines changed

Cargo.lock

+82-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ clap = { version = "4", features = ["derive", "env"] }
4343
crossbeam-skiplist = "0.1"
4444
dashmap = "5.5.3"
4545
derive_more = "0"
46-
fern = "0"
4746
figment = "0.10.18"
4847
futures = "0"
4948
futures-util = "0.3.30"
@@ -52,7 +51,6 @@ http-body = "1.0.0"
5251
hyper = "1"
5352
hyper-util = { version = "0.1.3", features = ["http1", "http2", "tokio"] }
5453
lazy_static = "1"
55-
log = { version = "0", features = ["release_max_level_info"] }
5654
multimap = "0"
5755
parking_lot = "0.12.1"
5856
percent-encoding = "2"
@@ -80,6 +78,7 @@ tower = { version = "0.4.13", features = ["timeout"] }
8078
tower-http = { version = "0", features = ["compression-full", "cors", "propagate-header", "request-id", "trace"] }
8179
trace = "0"
8280
tracing = "0"
81+
tracing-subscriber = { version = "0.3.18", features = ["json"] }
8382
url = "2"
8483
uuid = { version = "1", features = ["v4"] }
8584
zerocopy = "0.7.33"

packages/configuration/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ impl Info {
6464
let env_var_config_toml_path = ENV_VAR_CONFIG_TOML_PATH.to_string();
6565

6666
let config_toml = if let Ok(config_toml) = env::var(env_var_config_toml) {
67-
println!("Loading configuration from environment variable {config_toml} ...");
67+
println!("Loading configuration from environment variable:\n {config_toml}");
6868
Some(config_toml)
6969
} else {
7070
None

packages/located-error/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ rust-version.workspace = true
1515
version.workspace = true
1616

1717
[dependencies]
18-
log = { version = "0", features = ["release_max_level_info"] }
18+
tracing = "0.1.40"
1919

2020
[dev-dependencies]
2121
thiserror = "1"

packages/located-error/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ use std::error::Error;
3333
use std::panic::Location;
3434
use std::sync::Arc;
3535

36-
use log::debug;
36+
use tracing::debug;
3737

3838
pub type DynError = Arc<dyn std::error::Error + Send + Sync>;
3939

share/default/config/tracker.e2e.container.sqlite3.toml

+4
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,7 @@ ssl_key_path = "/var/lib/torrust/tracker/tls/localhost.key"
1111
[http_api]
1212
ssl_cert_path = "/var/lib/torrust/tracker/tls/localhost.crt"
1313
ssl_key_path = "/var/lib/torrust/tracker/tls/localhost.key"
14+
15+
[health_check_api]
16+
# Must be bound to wildcard IP to be accessible from outside the container
17+
bind_address = "0.0.0.0:1313"

src/app.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
//! - Tracker REST API: the tracker API can be enabled/disabled.
2424
use std::sync::Arc;
2525

26-
use log::warn;
2726
use tokio::task::JoinHandle;
2827
use torrust_tracker_configuration::Configuration;
28+
use tracing::warn;
2929

3030
use crate::bootstrap::jobs::{health_check_api, http_tracker, torrent_cleanup, tracker_apis, udp_tracker};
3131
use crate::servers::registar::Registar;

src/bootstrap/jobs/health_check_api.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
//! Refer to the [configuration documentation](https://docs.rs/torrust-tracker-configuration)
1515
//! for the API configuration options.
1616
17-
use log::info;
1817
use tokio::sync::oneshot;
1918
use tokio::task::JoinHandle;
2019
use torrust_tracker_configuration::HealthCheckApi;
20+
use tracing::info;
2121

2222
use super::Started;
2323
use crate::servers::health_check_api::server;

src/bootstrap/jobs/http_tracker.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ use std::net::SocketAddr;
1414
use std::sync::Arc;
1515

1616
use axum_server::tls_rustls::RustlsConfig;
17-
use log::info;
1817
use tokio::task::JoinHandle;
1918
use torrust_tracker_configuration::HttpTracker;
19+
use tracing::info;
2020

2121
use super::make_rust_tls;
2222
use crate::core;

src/bootstrap/jobs/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ use std::panic::Location;
8989
use std::sync::Arc;
9090

9191
use axum_server::tls_rustls::RustlsConfig;
92-
use log::info;
9392
use thiserror::Error;
9493
use torrust_tracker_configuration::TslConfig;
9594
use torrust_tracker_located_error::{DynError, LocatedError};
95+
use tracing::info;
9696

9797
/// Error returned by the Bootstrap Process.
9898
#[derive(Error, Debug)]

src/bootstrap/jobs/torrent_cleanup.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
use std::sync::Arc;
1414

1515
use chrono::Utc;
16-
use log::info;
1716
use tokio::task::JoinHandle;
1817
use torrust_tracker_configuration::v1::core::Core;
18+
use tracing::info;
1919

2020
use crate::core;
2121

src/bootstrap/jobs/tracker_apis.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ use std::net::SocketAddr;
2424
use std::sync::Arc;
2525

2626
use axum_server::tls_rustls::RustlsConfig;
27-
use log::info;
2827
use tokio::task::JoinHandle;
2928
use torrust_tracker_configuration::{AccessTokens, HttpApi};
29+
use tracing::info;
3030

3131
use super::make_rust_tls;
3232
use crate::core;

src/bootstrap/jobs/udp_tracker.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
//! > for the configuration options.
99
use std::sync::Arc;
1010

11-
use log::debug;
1211
use tokio::task::JoinHandle;
1312
use torrust_tracker_configuration::UdpTracker;
13+
use tracing::debug;
1414

1515
use crate::core;
1616
use crate::servers::registar::ServiceRegistrationForm;

0 commit comments

Comments
 (0)