summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2021-03-09 14:36:30 +0100
committerLinus Färnstrand <linus@mullvad.net>2021-03-09 14:36:30 +0100
commita094c8158a3ba3969bf6a23faf0e2a29ab40f5e5 (patch)
tree8992b0d2783d0fd5c43c608d055485637af52b29
parent92312e12954c9aef84db00aae0248134ff4abee2 (diff)
parentea7e2d82a8e7ab36b5a77cfdd9148d8d803a7d7d (diff)
downloadmullvadvpn-a094c8158a3ba3969bf6a23faf0e2a29ab40f5e5.tar.xz
mullvadvpn-a094c8158a3ba3969bf6a23faf0e2a29ab40f5e5.zip
Merge branch 'reduce-superfluous-openvpn-logging'
-rw-r--r--talpid-core/src/tunnel/openvpn/mod.rs3
-rw-r--r--talpid-openvpn-plugin/src/lib.rs1
2 files changed, 2 insertions, 2 deletions
diff --git a/talpid-core/src/tunnel/openvpn/mod.rs b/talpid-core/src/tunnel/openvpn/mod.rs
index 1236efde5a..520181d3cc 100644
--- a/talpid-core/src/tunnel/openvpn/mod.rs
+++ b/talpid-core/src/tunnel/openvpn/mod.rs
@@ -324,7 +324,6 @@ impl OpenVpnMonitor<OpenVpnCommand> {
panic!("Failed to add routes");
}
- #[cfg(target_os = "linux")]
if let Err(error) = route_manager_handle.create_routing_rules(ipv6_enabled) {
log::error!("{}", error.display_chain());
panic!("Failed to add routes");
@@ -950,7 +949,7 @@ mod event_server {
&self,
request: Request<EventType>,
) -> std::result::Result<Response<()>, tonic::Status> {
- log::info!("OpenVPN event {:?}", request);
+ log::trace!("OpenVPN event {:?}", request);
let request = request.into_inner();
diff --git a/talpid-openvpn-plugin/src/lib.rs b/talpid-openvpn-plugin/src/lib.rs
index a630d06033..e0ddc0100f 100644
--- a/talpid-openvpn-plugin/src/lib.rs
+++ b/talpid-openvpn-plugin/src/lib.rs
@@ -35,6 +35,7 @@ pub enum Error {
/// events.
pub static INTERESTING_EVENTS: &'static [EventType] = &[
EventType::AuthFailed,
+ #[cfg(target_os = "linux")]
EventType::Up,
EventType::RouteUp,
EventType::RoutePredown,