summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-04-12 17:03:47 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-05-16 20:06:18 +0000
commit953870bf4ef68a6d0fee0a506b809ba7033fb680 (patch)
tree51cf5e6e62794887c9fe1612ad8fefefb5fb572c
parentca00ab4b57f2bc89393a6bc67d011182c8706ca3 (diff)
downloadmullvadvpn-953870bf4ef68a6d0fee0a506b809ba7033fb680.tar.xz
mullvadvpn-953870bf4ef68a6d0fee0a506b809ba7033fb680.zip
Move `logging` module to library
-rw-r--r--mullvad-daemon/src/lib.rs1
-rw-r--r--mullvad-daemon/src/main.rs3
2 files changed, 2 insertions, 2 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index aab7f406f7..bf4c854c94 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -14,6 +14,7 @@ extern crate serde;
mod account_history;
mod geoip;
+pub mod logging;
mod management_interface;
mod relays;
mod rpc_uniqueness_check;
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index e9346405d9..c6b2e35f6b 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -9,12 +9,11 @@
#![deny(rust_2018_idioms)]
use log::{debug, error, info, warn};
-use mullvad_daemon::Daemon;
+use mullvad_daemon::{logging, Daemon};
use std::{path::PathBuf, thread, time::Duration};
use talpid_types::ErrorExt;
mod cli;
-mod logging;
mod shutdown;
#[cfg(windows)]
mod system_service;