diff --git a/Cargo.lock b/Cargo.lock index 6b07a303..00d08092 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -153,7 +153,7 @@ dependencies = [ "asn1-rs-derive 0.1.0", "asn1-rs-impl", "displaydoc", - "nom 7.1.3", + "nom", "num-traits", "rusticata-macros", "thiserror", @@ -169,7 +169,7 @@ dependencies = [ "asn1-rs-derive 0.4.0", "asn1-rs-impl", "displaydoc", - "nom 7.1.3", + "nom", "num-traits", "rusticata-macros", "thiserror", @@ -576,13 +576,13 @@ checksum = "4939f9ed1444bd8c896d37f3090012fa6e7834fe84ef8c9daa166109515732f9" [[package]] name = "cron" -version = "0.6.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab00a636277f7ea5d8dd92ac7a5099fc9a46e5327bba84d3640b41ae127eada9" +checksum = "1ff76b51e4c068c52bfd2866e1567bee7c567ae8f24ada09fd4307019e25eab7" dependencies = [ "chrono", - "error-chain", - "nom 4.1.1", + "nom", + "once_cell", ] [[package]] @@ -780,7 +780,7 @@ checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82" dependencies = [ "asn1-rs 0.3.1", "displaydoc", - "nom 7.1.3", + "nom", "num-bigint", "num-traits", "rusticata-macros", @@ -794,7 +794,7 @@ checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" dependencies = [ "asn1-rs 0.5.2", "displaydoc", - "nom 7.1.3", + "nom", "num-bigint", "num-traits", "rusticata-macros", @@ -935,7 +935,7 @@ dependencies = [ "chrono", "env_logger", "failure", - "job_scheduler", + "job_scheduler_ng", "log", ] @@ -949,15 +949,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "error-chain" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8" -dependencies = [ - "backtrace", -] - [[package]] name = "failure" version = "0.1.8" @@ -1538,14 +1529,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] -name = "job_scheduler" -version = "1.2.1" +name = "job_scheduler_ng" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f368c9c76dde2282714ae32dc274b79c27527a0c06c816f6dda048904d0d7c" +checksum = "10bbdf445513bbe53f4666218b7057d265c76fa0b30475e121a6bf05dbaacaae" dependencies = [ "chrono", "cron", - "uuid 0.8.2", + "uuid", ] [[package]] @@ -1697,15 +1688,6 @@ dependencies = [ "memoffset", ] -[[package]] -name = "nom" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c349f68f25f596b9f44cf0e7c69752a5c633b0550c3ff849518bfba0233774a" -dependencies = [ - "memchr", -] - [[package]] name = "nom" version = "7.1.3" @@ -2318,7 +2300,7 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" dependencies = [ - "nom 7.1.3", + "nom", ] [[package]] @@ -3080,15 +3062,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.8", -] - [[package]] name = "uuid" version = "1.5.0" @@ -3349,7 +3322,7 @@ dependencies = [ "tokio", "turn", "url", - "uuid 1.5.0", + "uuid", "waitgroup", "webrtc-mdns", "webrtc-util", @@ -3652,7 +3625,7 @@ dependencies = [ "data-encoding", "der-parser 7.0.0", "lazy_static", - "nom 7.1.3", + "nom", "oid-registry 0.4.0", "rusticata-macros", "thiserror", @@ -3670,7 +3643,7 @@ dependencies = [ "data-encoding", "der-parser 8.2.0", "lazy_static", - "nom 7.1.3", + "nom", "oid-registry 0.6.1", "ring", "rusticata-macros", diff --git a/library/logger/Cargo.toml b/library/logger/Cargo.toml index 05097693..895c4620 100644 --- a/library/logger/Cargo.toml +++ b/library/logger/Cargo.toml @@ -12,7 +12,7 @@ repository = "https://github.com/harlanc/xiu" [dependencies] anyhow = "^1.0" env_logger = "0.10.0" -job_scheduler = "1.2.1" +job_scheduler_ng = "2.0.4" chrono = "0.4" failure = "0.1.1" log = "0.4.0" diff --git a/library/logger/src/logger.rs b/library/logger/src/logger.rs index 0dd651ff..d568573a 100644 --- a/library/logger/src/logger.rs +++ b/library/logger/src/logger.rs @@ -3,7 +3,7 @@ use { anyhow::Result, chrono::prelude::*, env_logger::{Builder, Env, Target}, - job_scheduler::{Job, JobScheduler}, + job_scheduler_ng::{Job, JobScheduler}, std::{ env, fs, fs::{File, OpenOptions}, diff --git a/library/logger/src/target.rs b/library/logger/src/target.rs index 6c42688e..11db342f 100644 --- a/library/logger/src/target.rs +++ b/library/logger/src/target.rs @@ -63,10 +63,10 @@ mod tests { println!("{cur_number}"); } - - + + // #[test] - // fn test_job_scheduler() { + // fn test_job_scheduler_ng() { // let mut sched = JobScheduler::new(); // sched.add(Job::new("0 0 * * * *".parse().unwrap(), || {