diff options
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | mullvad-daemon/Cargo.toml | 12 | ||||
| -rw-r--r-- | mullvad-daemon/src/cli.rs | 2 | ||||
| -rw-r--r-- | mullvad-daemon/src/main.rs | 4 | ||||
| -rw-r--r-- | talpid-ipc/src/client.rs | 4 |
5 files changed, 7 insertions, 18 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4752664d6b..df5110dcfb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Hold off notifying the frontend of the 'unsecure' state until the VPN tunnel is actually completely disconnected. +### Changed +- Renamed daemon binary from `mullvadd` to `mullvad-daemon`. + ## [2017.1-beta6] - 2017-11-09 ### Added diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml index 3e7e52970e..dd52e758e7 100644 --- a/mullvad-daemon/Cargo.toml +++ b/mullvad-daemon/Cargo.toml @@ -6,18 +6,6 @@ description = "Mullvad VPN backend daemon. Runs and controls the VPN tunnels." license = "GPL-3.0" build = "build.rs" -[[bin]] -name = "mullvadd" -path = "src/main.rs" - -[[bin]] -name = "problem-report" -path = "src/bin/problem-report.rs" - -[[bin]] -name = "list-relays" -path = "src/bin/list-relays.rs" - [dependencies] app_dirs = "1.1" chrono = { version = "0.4", features = ["serde"] } diff --git a/mullvad-daemon/src/cli.rs b/mullvad-daemon/src/cli.rs index d3350ad90f..b4f7506692 100644 --- a/mullvad-daemon/src/cli.rs +++ b/mullvad-daemon/src/cli.rs @@ -29,7 +29,7 @@ pub fn get_config() -> Config { } fn create_app() -> App<'static, 'static> { - App::new(::CRATE_NAME) + App::new(crate_name!()) .version(crate_version!()) .author(crate_authors!()) .about(crate_description!()) diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs index f059b07379..2adcb0a9b7 100644 --- a/mullvad-daemon/src/main.rs +++ b/mullvad-daemon/src/main.rs @@ -113,10 +113,8 @@ lazy_static! { static ref RELAY_CACHE_UPDATE_TIMEOUT: Duration = Duration::from_millis(3000); } -const CRATE_NAME: &str = "mullvadd"; - static APP_INFO: AppInfo = AppInfo { - name: CRATE_NAME, + name: crate_name!(), author: "Mullvad", }; diff --git a/talpid-ipc/src/client.rs b/talpid-ipc/src/client.rs index 8085e461a3..72f4c696ff 100644 --- a/talpid-ipc/src/client.rs +++ b/talpid-ipc/src/client.rs @@ -19,7 +19,7 @@ impl<O: for<'de> serde::Deserialize<'de>> ws::Factory for Factory<O> { type Handler = Handler<O>; fn connection_made(&mut self, sender: ws::Sender) -> Self::Handler { - debug!("Sending: {}", self.request); + trace!("Sending: {}", self.request); if let Err(e) = sender .send(&self.request[..]) .chain_err(|| "Unable to send jsonrpc request") @@ -59,7 +59,7 @@ impl<O: for<'de> serde::Deserialize<'de>> Handler<O> { impl<O: for<'de> serde::Deserialize<'de>> ws::Handler for Handler<O> { fn on_message(&mut self, msg: ws::Message) -> ws::Result<()> { - debug!("WsIpcClient incoming message: {:?}", msg); + trace!("WsIpcClient incoming message: {:?}", msg); let reply_result = self.parse_reply(msg); let close_result = self.sender.close(ws::CloseCode::Normal); if let Err(e) = close_result.chain_err(|| "Unable to close WebSocket") { |