diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-09-22 10:32:17 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-09-22 10:32:17 +0200 |
| commit | 91d5df9f583ff77cbd7dbacc0f3ee19c01899a5a (patch) | |
| tree | 6f8792b52ff02ddab32925246299caf8102ccb4d /mullvad-daemon/src | |
| parent | e76d1f87a04d1dd48f897218e7f89b507cdbcb27 (diff) | |
| parent | c5147c0edb411cfec918c7acfae27417cca5223d (diff) | |
| download | mullvadvpn-91d5df9f583ff77cbd7dbacc0f3ee19c01899a5a.tar.xz mullvadvpn-91d5df9f583ff77cbd7dbacc0f3ee19c01899a5a.zip | |
Merge branch 'log-version-and-commit'2017.1-alpha4
Diffstat (limited to 'mullvad-daemon/src')
| -rw-r--r-- | mullvad-daemon/src/main.rs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs index 017c428fc2..ca189652c4 100644 --- a/mullvad-daemon/src/main.rs +++ b/mullvad-daemon/src/main.rs @@ -612,6 +612,7 @@ quick_main!(run); fn run() -> Result<()> { let config = cli::get_config(); init_logger(config.log_level, config.log_file.as_ref())?; + log_version(); let daemon = Daemon::new().chain_err(|| "Unable to initialize daemon")?; @@ -658,3 +659,12 @@ fn init_logger(log_level: log::LogLevelFilter, log_file: Option<&PathBuf>) -> Re .apply() .chain_err(|| "Failed to bootstrap logging system") } + +fn log_version() { + info!( + "Starting {} v{} {}", + env!("CARGO_PKG_NAME"), + env!("CARGO_PKG_VERSION"), + include_str!(concat!(env!("OUT_DIR"), "/git-commit-info.txt")) + ) +} |