From 4f2272593121de111b0b187047e505381077690b Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sun, 20 Jun 2021 00:03:30 +0200
Subject: [PATCH] Remove daemonization, it's always been broken

Fixes #68
---
 Cargo.toml                 |  1 -
 example-encrypted-dns.toml | 10 ----------
 src/config.rs              |  1 -
 src/main.rs                | 20 +-------------------
 4 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 484db05..467b3fa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,6 @@ byteorder = "1.4.2"
 clap = { version = "2.33.3", default-features = false, features = ["wrap_help"] }
 clockpro-cache = "0.1.10"
 coarsetime = "0.1.18"
-daemonize-simple = "0.1.5"
 derivative = "2.2.0"
 dnsstamps = "0.1.6"
 env_logger = { version = "0.8.3", default-features = false, features = ["humantime"] }
diff --git a/example-encrypted-dns.toml b/example-encrypted-dns.toml
index 24237dd..ab12063 100644
--- a/example-encrypted-dns.toml
+++ b/example-encrypted-dns.toml
@@ -90,16 +90,6 @@ cache_ttl_error = 600
 client_ttl_holdon = 60
 
 
-## Run as a background process
-
-daemonize = false
-
-
-## Log file, when running as a background process
-
-# log_file = "/tmp/encrypted-dns.log"
-
-
 ## PID file
 
 # pid_file = "/tmp/encrypted-dns.pid"
diff --git a/src/config.rs b/src/config.rs
index f3c9776..9d54adf 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -78,7 +78,6 @@ pub struct Config {
     pub filtering: FilteringConfig,
     pub dnscrypt: DNSCryptConfig,
     pub tls: TLSConfig,
-    pub daemonize: bool,
     pub pid_file: Option<PathBuf>,
     pub log_file: Option<PathBuf>,
     pub my_ip: Option<String>,
diff --git a/src/main.rs b/src/main.rs
index 7389ff2..feb73ee 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -466,9 +466,6 @@ fn bind_listeners(
 }
 
 fn privdrop(config: &Config) -> Result<(), Error> {
-    if config.daemonize && config.metrics.is_some() {
-        bail!("Metrics are incompatible with daemonization - set 'daemonize = false' in the configuration file if you need metrics.");
-    }
     let mut pd = PrivDrop::default();
     if let Some(user) = &config.user {
         pd = pd.user(user);
@@ -477,27 +474,12 @@ fn privdrop(config: &Config) -> Result<(), Error> {
         pd = pd.group(group);
     }
     if let Some(chroot) = &config.chroot {
-        if !config.daemonize {
-            pd = pd.chroot(chroot);
-        }
+        pd = pd.chroot(chroot);
     }
     if config.user.is_some() || config.group.is_some() || config.chroot.is_some() {
         info!("Dropping privileges");
         pd.apply()?;
     }
-    if config.daemonize {
-        let mut daemon = daemonize_simple::Daemonize::default();
-        daemon.stdout_file = config.log_file.clone();
-        daemon.stderr_file = config.log_file.clone();
-        daemon.pid_file = config.pid_file.clone();
-        if let Some(chroot) = &config.chroot {
-            daemon.chdir = Some(chroot.into());
-            daemon.chroot = true;
-        }
-        daemon
-            .doit()
-            .map_err(|e| anyhow!("Unable to daemonize: [{}]", e))?;
-    }
     Ok(())
 }