chore(tls-reload): Improve tls reloading & remove deps on rust 1.75

erebe · Jan 8, 2024 · f65ff1c · f65ff1c
1 parent f373293
commit f65ff1c
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/tunnel/tls_reloader.rs b/src/tunnel/tls_reloader.rs
@@ -8,7 +8,7 @@ use std::path::PathBuf;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::thread;
-use std::time::{Duration, SystemTime};
+use std::time::Duration;
 use tracing::{error, info, warn};
 
 struct TlsReloaderState {
@@ -83,13 +83,9 @@ impl TlsReloader {
             };
             drop(watcher);
 
-            let Ok(file) = File::open(&path) else {
+            let Ok(_) = File::open(&path) else {
                 return;
             };
-            let _ = file.set_modified(SystemTime::now()).map_err(|err| {
-                error!("Cannot force reload TLS file {:?}:  {:?}", path, err);
-                error!("Old certificate will be used until the next change");
-            });
         });
     }
 
@@ -116,6 +112,7 @@ impl TlsReloader {
                     }
                     Err(err) => {
                         warn!("Error while loading TLS certificate {:?}", err);
+                        Self::try_rewatch_certificate(this.clone(), path.to_path_buf());
                     }
                 },
                 EventKind::Remove(_) => {
@@ -137,6 +134,7 @@ impl TlsReloader {
                     }
                     Err(err) => {
                         warn!("Error while loading TLS private key {:?}", err);
+                        Self::try_rewatch_certificate(this.clone(), path.to_path_buf());
                     }
                 },
                 EventKind::Remove(_) => {