summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--mullvad-cli/Cargo.toml2
-rw-r--r--mullvad-rpc/Cargo.toml2
-rw-r--r--mullvad-types/Cargo.toml2
-rw-r--r--talpid-core/Cargo.toml2
-rw-r--r--talpid-ipc/Cargo.toml2
-rw-r--r--talpid-openvpn-plugin/Cargo.toml4
-rw-r--r--talpid-openvpn-plugin/src/lib.rs2
7 files changed, 8 insertions, 8 deletions
diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml
index 58090284d3..6bc0aa7d1d 100644
--- a/mullvad-cli/Cargo.toml
+++ b/mullvad-cli/Cargo.toml
@@ -13,7 +13,7 @@ path = "src/main.rs"
clap = "2.20"
error-chain = "0.11"
lazy_static = "1.0"
-log = "0.3"
+log = "0.4"
env_logger = "0.4"
serde = "1.0"
diff --git a/mullvad-rpc/Cargo.toml b/mullvad-rpc/Cargo.toml
index 39c17df17d..239df64ccb 100644
--- a/mullvad-rpc/Cargo.toml
+++ b/mullvad-rpc/Cargo.toml
@@ -16,6 +16,6 @@ tokio-core = "0.1"
hyper = "0.11"
hyper-tls = "0.1"
native-tls = "0.1"
-log = "0.3"
+log = "0.4"
mullvad-types = { path = "../mullvad-types" }
diff --git a/mullvad-types/Cargo.toml b/mullvad-types/Cargo.toml
index d6a41df035..d9444ced49 100644
--- a/mullvad-types/Cargo.toml
+++ b/mullvad-types/Cargo.toml
@@ -10,6 +10,6 @@ chrono = { version = "0.4", features = ["serde"] }
serde_derive = "1.0"
serde = "1.0"
error-chain = "0.11"
-log = "0.3"
+log = "0.4"
talpid-types = { path = "../talpid-types" }
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index e51a16c390..7f60c440bb 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -11,7 +11,7 @@ error-chain = "0.11"
jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.1" }
jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.1" }
lazy_static = "1.0"
-log = "0.3"
+log = "0.4"
uuid = { version = "0.5", features = ["v4"] }
shell-escape = "0.1"
diff --git a/talpid-ipc/Cargo.toml b/talpid-ipc/Cargo.toml
index 7e48addc46..9b2cee14b6 100644
--- a/talpid-ipc/Cargo.toml
+++ b/talpid-ipc/Cargo.toml
@@ -9,7 +9,7 @@ license = "GPL-3.0"
error-chain = "0.11"
serde = "1.0"
serde_json = "1.0"
-log = "0.3"
+log = "0.4"
jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.1" }
jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.1" }
ws = { git = "https://github.com/tomusdrw/ws-rs" }
diff --git a/talpid-openvpn-plugin/Cargo.toml b/talpid-openvpn-plugin/Cargo.toml
index 4b3a11b432..2fbc95e817 100644
--- a/talpid-openvpn-plugin/Cargo.toml
+++ b/talpid-openvpn-plugin/Cargo.toml
@@ -10,8 +10,8 @@ crate-type = ["cdylib"]
[dependencies]
error-chain = "0.11"
-log = "0.3"
-env_logger = "0.4"
+log = "0.4"
+env_logger = "0.5"
openvpn-plugin = { version = "0.3", features = ["serde", "log"] }
talpid-ipc = { path = "../talpid-ipc" }
diff --git a/talpid-openvpn-plugin/src/lib.rs b/talpid-openvpn-plugin/src/lib.rs
index f08aa4a9a5..f1c210b4d1 100644
--- a/talpid-openvpn-plugin/src/lib.rs
+++ b/talpid-openvpn-plugin/src/lib.rs
@@ -61,7 +61,7 @@ fn openvpn_open(
args: Vec<CString>,
_env: HashMap<CString, CString>,
) -> Result<(Vec<OpenVpnPluginEvent>, EventProcessor)> {
- env_logger::init().chain_err(|| "Failed to bootstrap logging system")?;
+ env_logger::init();
debug!("Initializing plugin");
let core_server_id = parse_args(&args)?;