Put a random nonce in the lease

Author: sourcefrog

Cargo.lock

@@ -42,6 +42,7 @@ clicolors-control = "1.0"
 crc32c = { version = "0.6.6", optional = true }
 derive_more = "0.99"
 fail = { version = "0.5.1" }
+fastrand = "2.3.0"
 filetime = "0.2"
 futures = { version = "0.3", optional = true }
 globset = "0.4.5"
@@ -107,7 +108,6 @@ predicates = "3"
 pretty_assertions = "1.0"
 proptest = "1.5"
 proptest-derive = "0.5"
-rand = "0.8"
 rstest = { version = "0.19", default-features = false }
 tracing-test = { version = "0.2", features = ["no-env-filter"] }
 

Cargo.toml

@@ -99,6 +99,7 @@ impl Lease {
             client_version: Some(crate::VERSION.to_string()),
             acquired: lease_taken,
             expiry: lease_expiry,
+            nonce: fastrand::u32(..),
         };
         let url = transport.url().join(LEASE_FILENAME).unwrap();
         let mut s: String = serde_json::to_string(&content).expect("serialize lease");
@@ -221,6 +222,8 @@ pub struct LeaseContent {
     pub pid: Option<u32>,
     /// Conserve version string.
     pub client_version: Option<String>,
+    /// Random nonce to distinguish different leases from the same client.
+    pub nonce: u32,
 
     /// Time when the lease was taken.
     #[serde(with = "time::serde::iso8601")]
@@ -330,7 +333,8 @@ mod test {
             "pid": 1234,
             "client_version": "0.1.2",
             "acquired": "2021-01-01T12:34:56Z",
-            "expiry": "2021-01-01T12:35:56Z"
+            "expiry": "2021-01-01T12:35:56Z",
+            "nonce": 12345
         }"#,
         )
         .unwrap();