Skip to content

Commit

Permalink
chore: use log4rs 1.3 (#6148)
Browse files Browse the repository at this point in the history
Description
---
Switch to log4rs 1.3

Motivation and Context
---
tari-project/log4rs#1
estk/log4rs#345

It appears that the log4rs commits arent used since the cargo.lock rev
was set to commit
[`e1051fd3a1bec9c55d055f60176a96cf11e58505`](tari-project/log4rs@e1051fd)
https://github.com/tari-project/log4rs/commits/master/#:r3d:-listview-node-:r3e:
and the crate was renamed to tari_log4rs. This rename will only break
the current build if the cargo.lock is updated. Since no rev or tag is
used, current `master` would be used.

@SWvheerden Please verify the changes are in log4rs@1.3 that were
required. Just this right?
https://github.com/estk/log4rs/blob/c981ca4e2126c5728505c562b34926f9a9fad00b/Cargo.toml#L59

Breaking Changes
---

- [x] None
- [ ] Requires data directory on base node to be deleted
- [ ] Requires hard fork
- [ ] Other - Please specify

<!-- Does this include a breaking change? If so, include this line as a
footer -->
<!-- BREAKING CHANGE: Description what the user should do, e.g. delete a
database, resync the chain -->
  • Loading branch information
sdbondi authored Feb 15, 2024
1 parent 4d01653 commit ab8d96a
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 22 deletions.
23 changes: 7 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion applications/minotari_console_wallet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ digest = "0.10"
futures = { version = "^0.3.16", default-features = false, features = [
"alloc",
] }
log4rs = { git = "https://github.com/tari-project/log4rs.git", default_features = false, features = [
log4rs = { version = "1.3.0", default_features = false, features = [
"config_parsing",
"threshold_filter",
"yaml_format",
Expand Down
2 changes: 1 addition & 1 deletion applications/minotari_miner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ derivative = "2.2.0"
futures = "0.3"
hex = "0.4.2"
log = { version = "0.4", features = ["std"] }
log4rs = { git = "https://github.com/tari-project/log4rs.git", default_features = false, features = ["config_parsing", "threshold_filter", "yaml_format", "console_appender", "rolling_file_appender", "compound_policy", "size_trigger", "fixed_window_roller"] }
log4rs = { version = "1.3.0", default_features = false, features = ["config_parsing", "threshold_filter", "yaml_format", "console_appender", "rolling_file_appender", "compound_policy", "size_trigger", "fixed_window_roller"] }
native-tls = "0.2"
num_cpus = "1.13"
rand = "0.8"
Expand Down
2 changes: 1 addition & 1 deletion applications/minotari_node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ futures = { version = "^0.3.16", default-features = false, features = ["alloc"]
qrcode = { version = "0.12" }
log = { version = "0.4.8", features = ["std"] }
log-mdc = "0.1.0"
log4rs = { git = "https://github.com/tari-project/log4rs.git", default_features = false, features = ["config_parsing", "threshold_filter", "yaml_format", "console_appender", "rolling_file_appender", "compound_policy", "size_trigger", "fixed_window_roller"] }
log4rs = { version = "1.3.0", default_features = false, features = ["config_parsing", "threshold_filter", "yaml_format", "console_appender", "rolling_file_appender", "compound_policy", "size_trigger", "fixed_window_roller"] }
nom = "7.1"
rustyline = "9.0"
rustyline-derive = "0.5"
Expand Down
2 changes: 1 addition & 1 deletion base_layer/chat_ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ tari_utilities = { version = "0.7" }
libc = "0.2.65"
libsqlite3-sys = { version = "0.25.1", features = ["bundled"], optional = true }
log = "0.4.6"
log4rs = { git = "https://github.com/tari-project/log4rs.git", features = ["console_appender", "file_appender", "yaml_format"] }
log4rs = { version = "1.3.0", features = ["console_appender", "file_appender", "yaml_format"] }
thiserror = "1.0.26"
tokio = "1.23"

Expand Down
2 changes: 1 addition & 1 deletion base_layer/wallet_ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ chrono = { version = "0.4.19", default-features = false, features = ["serde"] }
futures = { version = "^0.3.1", features =["compat", "std"]}
libc = "0.2.65"
log = "0.4.6"
log4rs = { git = "https://github.com/tari-project/log4rs.git", features = ["console_appender", "file_appender", "yaml_format"] }
log4rs = { version = "1.3.0", features = ["console_appender", "file_appender", "yaml_format"] }
rand = "0.8"
thiserror = "1.0.26"
tokio = "1.23"
Expand Down
2 changes: 1 addition & 1 deletion common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ config = { version = "0.13.0", default_features = false, features = ["toml"] }
dirs-next = "1.0.2"
git2 = { version = "0.18", default_features = false, optional = true }
log = "0.4.8"
log4rs = { git = "https://github.com/tari-project/log4rs.git", default_features = false, features = ["config_parsing", "threshold_filter", "yaml_format"] }
log4rs = { version = "1.3.0", default_features = false, features = ["config_parsing", "threshold_filter", "yaml_format"] }
multiaddr = { version = "0.14.0" }
path-clean = "0.1.0"
prost-build = { version = "0.11.9", optional = true }
Expand Down

0 comments on commit ab8d96a

Please sign in to comment.