From a5a84b5bddad3ee7a56ff44a9719bcea65a1925b Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sat, 21 Sep 2019 16:29:13 +0200
Subject: [PATCH] Log to file

---
 Cargo.toml         | 2 +-
 encrypted-dns.toml | 5 +++++
 src/config.rs      | 1 +
 src/main.rs        | 3 +++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index e3e8f93..49d2a1e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,7 +16,7 @@ byteorder = "1.3.2"
 clap = { version="2.33.0", features=["wrap_help", "nightly"] }
 clockpro-cache = "0.1.8"
 coarsetime = "0.1.11"
-daemonize-simple = "0.1.1"
+daemonize-simple = "0.1.2"
 derivative = "1.0.3"
 dnsstamps = "0.1.1"
 env_logger = "0.6.2"
diff --git a/encrypted-dns.toml b/encrypted-dns.toml
index becf830..5343f6f 100644
--- a/encrypted-dns.toml
+++ b/encrypted-dns.toml
@@ -76,6 +76,11 @@ cache_ttl_error = 600
 daemonize = false
 
 
+## Log file
+
+# 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 76259f3..ef90b1d 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -41,6 +41,7 @@ pub struct Config {
     pub tls: TLSConfig,
     pub daemonize: bool,
     pub pid_file: Option<PathBuf>,
+    pub log_file: Option<PathBuf>,
 }
 
 impl Config {
diff --git a/src/main.rs b/src/main.rs
index 158dc18..042bfcd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -344,6 +344,8 @@ fn privdrop(config: &Config) -> Result<(), Error> {
     }
     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());
@@ -358,6 +360,7 @@ fn privdrop(config: &Config) -> Result<(), Error> {
 
 fn main() -> Result<(), Error> {
     env_logger::Builder::from_default_env()
+        .write_style(env_logger::WriteStyle::Never)
         .default_format_module_path(false)
         .default_format_timestamp(false)
         .filter_level(log::LevelFilter::Info)