diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-05-22 11:41:16 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-05-22 12:28:24 +0000 |
| commit | 4625ca12f83eb32d198c5a7ac691c0039889fe51 (patch) | |
| tree | f4e94e9ece21a05932562cd2db6b4d8559816f46 | |
| parent | 0f260b311c5cd4e9ee14f93e352910b5a2e1f394 (diff) | |
| download | mullvadvpn-4625ca12f83eb32d198c5a7ac691c0039889fe51.tar.xz mullvadvpn-4625ca12f83eb32d198c5a7ac691c0039889fe51.zip | |
Move `log_version` function to `version` module
| -rw-r--r-- | mullvad-daemon/src/main.rs | 11 | ||||
| -rw-r--r-- | mullvad-daemon/src/version.rs | 9 |
2 files changed, 10 insertions, 10 deletions
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs index 8deae9f489..9d4ca0fb56 100644 --- a/mullvad-daemon/src/main.rs +++ b/mullvad-daemon/src/main.rs @@ -48,7 +48,7 @@ fn init_logging(config: &cli::Config) -> Result<Option<PathBuf>, String> { ) .map_err(|e| e.display_chain_with_msg("Unable to initialize logger"))?; log_panics::init(); - log_version(); + version::log_version(); if let Some(ref log_dir) = log_dir { info!("Logging to {}", log_dir.display()); } @@ -119,15 +119,6 @@ fn create_daemon(log_dir: Option<PathBuf>) -> Result<Daemon, String> { .map_err(|e| e.display_chain_with_msg("Unable to initialize daemon")) } -fn log_version() { - info!( - "Starting {} - {} {}", - env!("CARGO_PKG_NAME"), - version::PRODUCT_VERSION, - version::COMMIT_DATE, - ) -} - #[cfg(unix)] fn running_as_admin() -> bool { let uid = unsafe { libc::getuid() }; diff --git a/mullvad-daemon/src/version.rs b/mullvad-daemon/src/version.rs index f02e2b5fda..72c28144ff 100644 --- a/mullvad-daemon/src/version.rs +++ b/mullvad-daemon/src/version.rs @@ -3,3 +3,12 @@ pub const PRODUCT_VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/produc /// Contains the date of the git commit this was built from pub const COMMIT_DATE: &str = include_str!(concat!(env!("OUT_DIR"), "/git-commit-date.txt")); + +pub fn log_version() { + log::info!( + "Starting {} - {} {}", + env!("CARGO_PKG_NAME"), + PRODUCT_VERSION, + COMMIT_DATE, + ) +} |
