hex/wstunnel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Σrebe - Romain GERARD 2024-01-08 14:08:10 +01:00
parent f373293ede
commit 41a88beb8d
No known key found for this signature in database
GPG key ID: 7A42B4B97E0332F4
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/tunnel/tls_reloader.rs
View file

@ -3,12 +3,11 @@ use anyhow::Context;
use log::trace;
use notify::{EventKind, RecommendedWatcher, Watcher};
use parking_lot::Mutex;
use std::fs::File;
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 +82,13 @@ impl TlsReloader {
};
drop(watcher);
let Ok(file) = File::open(&path) else {
return;
// Generate a fake event to force-reload the certificate
let event = notify::Event {
kind: EventKind::Create(notify::event::CreateKind::Any),
paths: vec![path],
attrs: Default::default(),
};
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");
});
Self::handle_fs_event(&this, Ok(event));
});
}
@ -116,6 +115,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 +137,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(_) => {