From 7ef0634b5cf46eac7453a0cf6d652b25b4012ff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20Ciarcin=CC=81ski?= <adam@defguard.net>
Date: Fri, 22 Aug 2025 12:05:32 +0200
Subject: [PATCH] Drop handling of service reload; switch to std OnceLock

---
 crates/defguard/src/main.rs        | 6 ++++--
 crates/defguard_core/src/config.rs | 2 +-
 crates/defguard_core/src/lib.rs    | 5 ++---
 defguard.service                   | 1 -
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/crates/defguard/src/main.rs b/crates/defguard/src/main.rs
index ab294c0e01..9ec084cd17 100644
--- a/crates/defguard/src/main.rs
+++ b/crates/defguard/src/main.rs
@@ -40,7 +40,9 @@ async fn main() -> Result<(), anyhow::Error> {
         dotenvy::dotenv().ok();
     }
     let config = DefGuardConfig::new();
-    SERVER_CONFIG.set(config.clone())?;
+    SERVER_CONFIG
+        .set(config.clone())
+        .expect("Failed to initialize server config.");
 
     // initialize tracing with version formatter
     defguard_version::tracing::init(
@@ -48,7 +50,7 @@ async fn main() -> Result<(), anyhow::Error> {
         &config.log_level,
     )?;
 
-    info!("Starting ... version v{}", VERSION);
+    info!("Starting ... version v{VERSION}");
     debug!("Using config: {config:?}");
 
     let pool = init_db(
diff --git a/crates/defguard_core/src/config.rs b/crates/defguard_core/src/config.rs
index c03d493708..e3cf365da5 100644
--- a/crates/defguard_core/src/config.rs
+++ b/crates/defguard_core/src/config.rs
@@ -233,7 +233,7 @@ impl DefGuardConfig {
     }
 
     // Check if cookie domain value was provided.
-    // If not generate it based on URL.
+    // If not, generate it based on URL.
     fn validate_cookie_domain(&mut self) {
         if self.cookie_domain.is_none() {
             self.cookie_domain = Some(
diff --git a/crates/defguard_core/src/lib.rs b/crates/defguard_core/src/lib.rs
index 19bac7540e..9ff61dd385 100644
--- a/crates/defguard_core/src/lib.rs
+++ b/crates/defguard_core/src/lib.rs
@@ -3,7 +3,7 @@
 #![allow(clippy::result_large_err)]
 use std::{
     net::{IpAddr, Ipv4Addr, SocketAddr},
-    sync::{Arc, Mutex},
+    sync::{Arc, Mutex, OnceLock},
 };
 
 use anyhow::anyhow;
@@ -63,7 +63,6 @@ use sqlx::PgPool;
 use tokio::{
     net::TcpListener,
     sync::{
-        OnceCell,
         broadcast::Sender,
         mpsc::{UnboundedReceiver, UnboundedSender},
     },
@@ -178,7 +177,7 @@ extern crate serde;
 pub static MIGRATOR: sqlx::migrate::Migrator = sqlx::migrate!("../../migrations");
 
 pub const VERSION: &str = concat!(env!("CARGO_PKG_VERSION"), "-", env!("VERGEN_GIT_SHA"));
-pub static SERVER_CONFIG: OnceCell<DefGuardConfig> = OnceCell::const_new();
+pub static SERVER_CONFIG: OnceLock<DefGuardConfig> = OnceLock::new();
 
 pub(crate) fn server_config() -> &'static DefGuardConfig {
     SERVER_CONFIG
diff --git a/defguard.service b/defguard.service
index a3cf590d7b..6e36c0040d 100644
--- a/defguard.service
+++ b/defguard.service
@@ -7,7 +7,6 @@ After=network-online.target
 [Service]
 DynamicUser=yes
 User=defguard
-ExecReload=/bin/kill -HUP $MAINPID
 EnvironmentFile=/etc/defguard/core.conf
 ExecStart=/usr/bin/defguard
 KillMode=process