diff --git a/Cargo.lock b/Cargo.lock index d6dc0924..10c835ce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1273,9 +1273,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "492895b76e8c1a78a419f2977a38e42032077ca67d101d26b435ee705119e373" [[package]] -name = "job_scheduler" -version = "1.2.1" -source = "git+https://github.com/BlackDex/job_scheduler?rev=9100fc596a083fd9c0b560f8f11f108e0a19d07e#9100fc596a083fd9c0b560f8f11f108e0a19d07e" +name = "job_scheduler_ng" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc933da2dd33e6fe37f970e789e76725971e4a9b7a452c52bd5577be45a9ca4a" dependencies = [ "chrono", "cron", @@ -3361,7 +3362,7 @@ dependencies = [ "handlebars", "html5gum", "idna 0.2.3", - "job_scheduler", + "job_scheduler_ng", "jsonwebtoken", "lettre", "libsqlite3-sys", diff --git a/Cargo.toml b/Cargo.toml index 13e4e0c4..c2a1dc12 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -87,7 +87,7 @@ chrono-tz = "0.6.1" time = "0.3.9" # Job scheduler -job_scheduler = "1.2.1" +job_scheduler_ng = "2.0.0" # Data encoding library Hex/Base32/Base64 data-encoding = "2.3.2" @@ -146,15 +146,6 @@ ctrlc = { version = "3.2.2", features = ["termination"] } # Mainly used for the musl builds, since the default musl malloc is very slow mimalloc = { version = "0.1.29", features = ["secure"], default-features = false, optional = true } -[patch.crates-io] -# The maintainer of the `job_scheduler` crate doesn't seem to have responded -# to any issues or PRs for almost a year (as of April 2021). This hopefully -# temporary fork updates Cargo.toml to use more up-to-date dependencies. -# In particular, `cron` has since implemented parsing of some common syntax -# that wasn't previously supported (https://github.com/zslayton/cron/pull/64). -# 2022-05-04: Forked/Updated the job_scheduler again use the latest dependencies and some fixes. -job_scheduler = { git = 'https://github.com/BlackDex/job_scheduler', rev = '9100fc596a083fd9c0b560f8f11f108e0a19d07e' } - # Strip debuginfo from the release builds # Also enable thin LTO for some optimizations [profile.release] diff --git a/src/main.rs b/src/main.rs index 32257c78..502d74ec 100644 --- a/src/main.rs +++ b/src/main.rs @@ -397,7 +397,7 @@ async fn schedule_jobs(pool: db::DbPool) { thread::Builder::new() .name("job-scheduler".to_string()) .spawn(move || { - use job_scheduler::{Job, JobScheduler}; + use job_scheduler_ng::{Job, JobScheduler}; let _runtime_guard = runtime.enter(); let mut sched = JobScheduler::new();