diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-08-16 10:18:55 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-08-16 12:31:38 +0200 |
| commit | e20698c32fde6bcdc8306910430cf7593831d795 (patch) | |
| tree | bdd20725ff99194a69718fd000664244c3f9650f | |
| parent | baa3e5d8160dedcfbb1e0894e4f07ec0f75229ef (diff) | |
| download | mullvadvpn-e20698c32fde6bcdc8306910430cf7593831d795.tar.xz mullvadvpn-e20698c32fde6bcdc8306910430cf7593831d795.zip | |
Log panics instead of printing to stderr
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | Cargo.lock | 10 | ||||
| -rw-r--r-- | mullvad-daemon/Cargo.toml | 1 | ||||
| -rw-r--r-- | mullvad-daemon/src/main.rs | 2 |
4 files changed, 14 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d3cd05eef..bfd3f7dddf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ Line wrap the file at 100 chars. Th ## [Unreleased] ### Added - Add option to enable or disable IPv6 on the tunnel interface. +- Log panics in the daemon to the log file. ### Changed - The "Buy more credit" button is changed to open a dedicated account login page instead of one diff --git a/Cargo.lock b/Cargo.lock index 4a1906e281..7a41a750d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -701,6 +701,14 @@ dependencies = [ ] [[package]] +name = "log-panics" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "matches" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -841,6 +849,7 @@ dependencies = [ "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "log-panics 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "mullvad-ipc-client 0.1.0", "mullvad-paths 0.1.0", "mullvad-rpc 0.1.0", @@ -2096,6 +2105,7 @@ source = "git+https://github.com/mullvad/rust-openssl#4dbd237fe1f6454d8a0042ccf4 "checksum linked_hash_set 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3c7c91c4c7bbeb4f2f7c4e5be11e6a05bd6830bc37249c47ce1ad86ad453ff9c" "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" "checksum log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "61bd98ae7f7b754bc53dca7d44b604f733c6bba044ea6f41bc8d89272d8161d2" +"checksum log-panics 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ae0136257df209261daa18d6c16394757c63e032e27aafd8b07788b051082bef" "checksum matches 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "835511bab37c34c47da5cb44844bea2cfde0236db0b506f90ea4224482c9774a" "checksum memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a" "checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d" diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml index 482b353049..42d4911d01 100644 --- a/mullvad-daemon/Cargo.toml +++ b/mullvad-daemon/Cargo.toml @@ -14,6 +14,7 @@ futures = "0.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" log = "0.4" +log-panics = "2.0.0" jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", tag = "v8.0.1" } jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc", tag = "v8.0.1" } jsonrpc-pubsub = { git = "https://github.com/paritytech/jsonrpc", tag = "v8.0.1" } diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs index 9c87bdef74..d1e620f3df 100644 --- a/mullvad-daemon/src/main.rs +++ b/mullvad-daemon/src/main.rs @@ -16,6 +16,7 @@ extern crate futures; extern crate libc; #[macro_use] extern crate log; +extern crate log_panics; #[macro_use] extern crate serde; @@ -909,6 +910,7 @@ fn run() -> Result<()> { log_file.as_ref(), config.log_stdout_timestamps, ).chain_err(|| ErrorKind::LogError("Unable to initialize logger"))?; + log_panics::init(); log_version(); if let Some(ref log_dir) = log_dir { info!("Logging to {}", log_dir.display()); |