Start to switch from chrono to time crate

spk · spk · commit de8b0887bc11 · 2021-12-07T22:09:54.000+01:00
[RUSTSEC-2020-0159](https://rustsec.org/advisories/RUSTSEC-2020-0159)
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,4 +21,4 @@ serde = "1.0"
 serde_json = "1.0"
 r2d2 = "0.8"
 r2d2_redis = "0.14"
-chrono = "0.4.19"
+time = "0.3"
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ sidekiq = "0.10"
 ```rust
 use sidekiq::{Job, Value};
 use sidekiq::{Client, ClientOpts, create_redis_pool};
-use chrono::Duration;
+use time::{OffsetDateTime, Duration};
 
 let ns = "test";
 let client_opts = ClientOpts {
@@ -65,8 +65,7 @@ match client.perform_in(interval, job) {
 
 // scheduled-jobs (perform_at)
 let job = Job::new(class, vec![sidekiq::Value::Null], Default::default());
-let now: DateTime<Local> = Local::now();
-let start_at = now + Duration::hours(1);
+let start_at = OffsetDateTime::now_utc().checked_add(Duration::HOUR).unwrap();
 match client.perform_at(start_at, job) {
     Ok(_) => {},
     Err(err) => {
diff --git a/src/sidekiq/mod.rs b/src/sidekiq/mod.rs
@@ -10,7 +10,7 @@ use rand::{thread_rng, Rng};
 use serde::ser::SerializeStruct;
 use serde::{Serialize, Serializer};
 
-use chrono::{DateTime, Duration, Local};
+use time::{OffsetDateTime, Duration};
 
 const REDIS_URL_ENV: &str = "REDIS_URL";
 const REDIS_URL_DEFAULT: &str = "redis://127.0.0.1/";
@@ -205,7 +205,7 @@ impl Client {
         let div: f64 = 1_000_f64;
         let maximum_target: f64 = 1_000_000_000_f64;
         let target_millsec: f64 = target_millsec_number / div;
-        let now_millisec: f64 = Local::now().timestamp_millis() as f64 / div;
+        let now_millisec = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs() as f64 / div;
 
         let start_at: f64 = if target_millsec < maximum_target {
             now_millisec + target_millsec
@@ -221,20 +221,20 @@ impl Client {
     }
 
     fn convert_duration_to_millsec(&self, interval: Duration) -> Option<f64> {
-        let interval_millsec: f64 = interval.num_milliseconds() as f64;
+        let interval_millsec: f64 = interval.subsec_milliseconds() as f64;
         self.calc_at(interval_millsec)
     }
 
-    fn convert_datetime_to_millsec(&self, datetime: DateTime<Local>) -> Option<f64> {
-        let timestamp_millsec: f64 = datetime.timestamp_millis() as f64;
+    fn convert_datetime_to_millsec(&self, datetime: OffsetDateTime) -> Option<f64> {
+        let timestamp_millsec: f64 = datetime.millisecond() as f64;
         self.calc_at(timestamp_millsec)
     }
 
     pub fn perform_in(&self, interval: Duration, job: Job) -> Result<(), ClientError> {
         self.raw_push(&[job], self.convert_duration_to_millsec(interval))
     }
 
-    pub fn perform_at(&self, local_datetime: DateTime<Local>, job: Job) -> Result<(), ClientError> {
+    pub fn perform_at(&self, local_datetime: OffsetDateTime, job: Job) -> Result<(), ClientError> {
         self.raw_push(&[job], self.convert_datetime_to_millsec(local_datetime))
     }
 
diff --git a/tests/lib.rs b/tests/lib.rs
@@ -8,7 +8,7 @@ use std::time::{SystemTime, UNIX_EPOCH};
 use serde_json::value::Value;
 use sidekiq::{create_redis_pool, Client, ClientOpts, Job};
 
-use chrono::{DateTime, Duration, Local};
+use time::{OffsetDateTime, Duration};
 
 fn args() -> Vec<Value> {
     let value = json!({
@@ -117,8 +117,7 @@ fn test_client_perform_at() {
     let class = "MyClass".to_string();
     let job = Job::new(class, args(), Default::default());
     let client = get_client();
-    let now: DateTime<Local> = Local::now();
-    let start_at = now + Duration::hours(1);
+    let start_at = OffsetDateTime::now_utc();
     match client.perform_at(start_at, job) {
         Ok(_) => {}
         Err(err) => {
@@ -130,9 +129,8 @@ fn test_client_perform_at() {
     let class = "MyClass".to_string();
     let job = Job::new(class, args(), Default::default());
     let client = get_client();
-    let now: DateTime<Local> = Local::now();
-    let start_datetime = now + Duration::hours(0);
-    match client.perform_at(start_datetime, job) {
+    let start_at = OffsetDateTime::now_utc().checked_add(Duration::HOUR).unwrap();
+    match client.perform_at(start_at, job) {
         Ok(_) => {}
         Err(err) => {
             println!("Sidekiq push failed: {}", err);
