YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-03-31 17:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ws: skip updating tls cert if file data same as currently loaded

Browse source
This commit is contained in:
Joakim Frostegård 2023-10-24 20:40:44 +02:00
parent 78645fe658
commit 0d83bd51ee
1 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/ws/src/lib.rs
View file

@ -87,6 +87,14 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
} else { } else {
None None
}; };
let mut opt_tls_cert_data = if config.network.enable_tls {
Some(
::std::fs::read(&config.network.tls_certificate_path)
.with_context(|| "open tls certificate file")?,
)
} else {
None
};
let server_start_instant = ServerStartInstant::new(); let server_start_instant = ServerStartInstant::new();
@ -184,18 +192,27 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
let _ = update_access_list(&config.access_list, &state.access_list); let _ = update_access_list(&config.access_list, &state.access_list);
if let Some(tls_config) = opt_tls_config.as_ref() { if let Some(tls_config) = opt_tls_config.as_ref() {
match ::std::fs::read(&config.network.tls_certificate_path) {
Ok(data) if &data == opt_tls_cert_data.as_ref().unwrap() => {
::log::info!("skipping tls config update: certificate identical to currently loaded");
}
Ok(data) => {
match create_rustls_config( match create_rustls_config(
&config.network.tls_certificate_path, &config.network.tls_certificate_path,
&config.network.tls_private_key_path, &config.network.tls_private_key_path,
) { ) {
Ok(config) => { Ok(config) => {
tls_config.store(Arc::new(config)); tls_config.store(Arc::new(config));
opt_tls_cert_data = Some(data);
::log::info!("successfully updated tls config"); ::log::info!("successfully updated tls config");
} }
Err(err) => ::log::error!("could not update tls config: {:#}", err), Err(err) => ::log::error!("could not update tls config: {:#}", err),
} }
} }
Err(err) => ::log::error!("couldn't read tls certificate file: {:#}", err),
}
}
} }
SIGTERM => { SIGTERM => {
if sentinel_watcher.panic_was_triggered() { if sentinel_watcher.panic_was_triggered() {