Add log directory to help output

3 files changed, 9 insertions, 5 deletions

diff --git a/mullvad-daemon/src/cli.rs b/mullvad-daemon/src/cli.rs
index 0fe85588fe..722a176878 100644
--- a/mullvad-daemon/src/cli.rs
+++ b/mullvad-daemon/src/cli.rs
@@ -43,6 +43,7 @@ lazy_static::lazy_static! {
                                [Default: {}]
     MULLVAD_SETTINGS_DIR       Directory path for storing settings. [Default: {}]
     MULLVAD_CACHE_DIR          Directory path for storing cache. [Default: {}]
+    MULLVAD_LOG_DIR            Directory path for storing logs. [Default: {}]
     MULLVAD_RPC_SOCKET_PATH    Location of the management interface device.
                                It refers to Unix domain socket on Unix based platforms, and named pipe on Windows.
                                [Default: {}]
@@ -51,6 +52,7 @@ lazy_static::lazy_static! {
         mullvad_paths::get_default_resource_dir().display(),
         mullvad_paths::get_default_settings_dir().expect("Unable to get settings dir").display(),
         mullvad_paths::get_default_cache_dir().expect("Unable to get cache dir").display(),
+        mullvad_paths::get_default_log_dir().expect("Unable to get log dir").display(),
         mullvad_paths::get_default_rpc_socket_path().display());
 }
 
diff --git a/mullvad-paths/src/lib.rs b/mullvad-paths/src/lib.rs
index 17ba19b44a..b95e281f19 100644
--- a/mullvad-paths/src/lib.rs
+++ b/mullvad-paths/src/lib.rs
@@ -45,7 +45,7 @@ mod cache;
 pub use crate::cache::{cache_dir, get_default_cache_dir};
 
 mod logs;
-pub use crate::logs::{get_log_dir, log_dir};
+pub use crate::logs::{get_default_log_dir, get_log_dir, log_dir};
 
 pub mod resources;
 pub use crate::resources::{get_default_resource_dir, get_resource_dir};
diff --git a/mullvad-paths/src/logs.rs b/mullvad-paths/src/logs.rs
index 70004342c1..91f92c82bc 100644
--- a/mullvad-paths/src/logs.rs
+++ b/mullvad-paths/src/logs.rs
@@ -13,17 +13,19 @@ pub fn log_dir() -> Result<PathBuf> {
 pub fn get_log_dir() -> Result<PathBuf> {
     match env::var_os("MULLVAD_LOG_DIR") {
         Some(path) => Ok(PathBuf::from(path)),
-        None => get_default_log_dir().map(|dir| dir.join(crate::PRODUCT_NAME)),
+        None => get_default_log_dir(),
     }
 }
 
-fn get_default_log_dir() -> Result<PathBuf> {
+pub fn get_default_log_dir() -> Result<PathBuf> {
+    let dir;
     #[cfg(unix)]
     {
-        Ok(PathBuf::from("/var/log"))
+        dir = Ok(PathBuf::from("/var/log"));
     }
     #[cfg(windows)]
     {
-        ::get_allusersprofile_dir()
+        dir = ::get_allusersprofile_dir();
     }
+    dir.map(|dir| dir.join(crate::PRODUCT_NAME))
 }