Better logging on windows

Cargo.toml

@@ -39,9 +39,6 @@ librespot = { version = "0.1.1", default-features = false, features = [
     "with-tremor"
 ] }
 
-[target."cfg(target_os = \"windows\")".dependencies]
-windows-service = "0.2.0"
-
 [target."cfg(unix)".dependencies]
 daemonize = "0.4"
 syslog = "4"

src/config.rs

@@ -600,6 +600,7 @@ pub(crate) struct SpotifydConfig {
     pub(crate) player_config: PlayerConfig,
     pub(crate) session_config: SessionConfig,
     pub(crate) onevent: Option<String>,
+    #[allow(unused)]
     pub(crate) pid: Option<String>,
     pub(crate) shell: String,
     pub(crate) zeroconf_port: Option<u16>,

src/main.rs

@@ -38,14 +38,21 @@ fn setup_logger(log_target: LogTarget, log_level: LevelFilter) {
             logger.chain(syslog::unix(log_format).expect("Couldn't initialize logger"))
         }
         #[cfg(target_os = "windows")]
-        LogTarget::Syslog => logger.chain(
-            std::fs::OpenOptions::new()
-                .write(true)
-                .create(true)
-                .truncate(true)
-                .open(".spotifyd.log")
-                .expect("Couldn't initialize logger"),
-        ),
+        LogTarget::Syslog => {
+            let dirs = directories::BaseDirs::new().unwrap();
+            let mut log_file = dirs.config_dir().to_path_buf();
+            log_file.push("spotifyd");
+            log_file.push(".spotifyd.log");
+
+            logger.chain(
+                std::fs::OpenOptions::new()
+                    .write(true)
+                    .create(true)
+                    .truncate(true)
+                    .open(log_file)
+                    .expect("Couldn't initialize logger"),
+            )
+        }
     };
 
     logger.apply().expect("Couldn't initialize logger");
@@ -72,7 +79,11 @@ fn main() {
         }
         #[cfg(target_os = "windows")]
         {
-            LogTarget::Syslog
+            if std::env::var("SPOTIFYD_CHILD").is_ok() {
+                LogTarget::Syslog
+            } else {
+                LogTarget::Terminal
+            }
         }
     };
     let log_level = if cli_config.verbose {
@@ -114,6 +125,7 @@ fn main() {
 
             Command::new(std::env::current_exe().unwrap())
                 .args(args)
+                .env("SPOTIFYD_CHILD", "1")
                 .creation_flags(8 /* DETACHED_PROCESS */)
                 .spawn()
                 .expect("Couldn't spawn daemon");