diff --git a/Cargo.lock b/Cargo.lock index 56f66b3..70f8452 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -117,6 +117,7 @@ dependencies = [ "simplelog", "sqlite", "thread-priority", + "time 0.3.9", "tinyfiledialogs", "toml", "ureq", @@ -280,7 +281,7 @@ dependencies = [ "num-integer", "num-traits", "serde", - "time", + "time 0.1.44", "winapi", ] @@ -725,9 +726,9 @@ checksum = "cb691a747a7ab48abc15c5b42066eaafde10dc427e3b6ee2a1cf43db04c763bd" [[package]] name = "log" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if", ] @@ -792,9 +793,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] @@ -809,6 +810,15 @@ dependencies = [ "libc", ] +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + [[package]] name = "once_cell" version = "1.8.0" @@ -823,9 +833,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "open" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9213e7b66aa06a7722828ee2980c1adff22a3922b582baaa1e62e30ca2a6c018" +checksum = "e0524af9508f9b5c4eb41dce095860456727748f63b478d625f119a70e0d764a" dependencies = [ "pathdiff", "winapi", @@ -1077,9 +1087,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" +checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" dependencies = [ "itoa", "ryu", @@ -1118,13 +1128,13 @@ checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4" [[package]] name = "simplelog" -version = "0.11.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1348164456f72ca0116e4538bdaabb0ddb622c7d9f16387c725af3e96d6001c" +checksum = "48dfff04aade74dd495b007c831cd6f4e0cee19c344dd9dc0884c0289b70a786" dependencies = [ - "chrono", "log", "termcolor", + "time 0.3.9", ] [[package]] @@ -1292,6 +1302,24 @@ dependencies = [ "winapi", ] +[[package]] +name = "time" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" +dependencies = [ + "itoa", + "libc", + "num_threads", + "time-macros", +] + +[[package]] +name = "time-macros" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" + [[package]] name = "tinyfiledialogs" version = "3.9.1" diff --git a/Cargo.toml b/Cargo.toml index aa8c7fe..a983463 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,8 +12,8 @@ exclude = ["blockchain.db", "alfis.toml"] [dependencies] getopts = "0.2.21" -log = "0.4.16" -simplelog = "0.11.2" +log = "0.4.17" +simplelog = "0.12.0" toml = "0.5.9" digest = "0.10.2" sha2 = "0.10.2" @@ -26,13 +26,14 @@ blakeout = "0.3.0" num_cpus = "1.13.1" byteorder = "1.4.3" serde = { version = "1.0.137", features = ["derive"] } -serde_json = "1.0.79" +serde_json = "1.0.81" bincode = "1.3.3" serde_cbor = "0.11.2" base64 = "0.13.0" num-bigint = "0.4.3" -num-traits = "0.2.14" +num-traits = "0.2.15" chrono = { version = "0.4.19", features = ["serde"] } +time = "0.3.9" rand = { version = "0.8.5", package = "rand" } rand-old = { package = "rand", version = "0.7.0" } # For ed25519-dalek sqlite = "0.26.0" @@ -46,7 +47,7 @@ lazy_static = "1.4.0" # Optional dependencies regulated by features web-view = { version = "0.7.3", features = [], optional = true } tinyfiledialogs = { version = "3.9.1", optional = true } -open = { version = "2.1.1", optional = true } +open = { version = "2.1.2", optional = true } [target.'cfg(windows)'.dependencies] winapi = { version = "0.3.9", features = ["impl-default", "wincon", "shellscalingapi"] } diff --git a/src/main.rs b/src/main.rs index dafe6e0..cb7da5e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,7 +11,7 @@ use std::{env, thread}; use getopts::{Matches, Options}; #[allow(unused_imports)] use log::{debug, error, info, trace, warn, LevelFilter}; -use simplelog::*; +use simplelog::{ColorChoice, CombinedLogger, ConfigBuilder, format_description, LevelPadding, TerminalMode, TermLogger, WriteLogger}; #[cfg(windows)] use winapi::um::wincon::{AttachConsole, FreeConsole, ATTACH_PARENT_PROCESS}; extern crate lazy_static; @@ -259,10 +259,11 @@ fn setup_logger(opt_matches: &Matches, console_attached: bool) { .set_thread_level(LevelFilter::Error) .set_location_level(LevelFilter::Off) .set_target_level(LevelFilter::Error) - .set_time_level(LevelFilter::Error) - .set_time_format_str("%F %T%.3f") - .set_time_to_local(true) .set_level_padding(LevelPadding::Right) + .set_time_level(LevelFilter::Error) + .set_time_format_custom(format_description!("[hour]:[minute]:[second].[subsecond]")) + .set_time_offset_to_local() + .unwrap() .build(); match opt_matches.opt_str("l") { None => {