diff options
| author | David Lönnhager <david.l@mullvad.net> | 2024-06-24 09:30:56 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2024-06-24 09:30:56 +0200 |
| commit | 8d34e2c6f339c098a7da800321370367c17bfdb7 (patch) | |
| tree | 7c089fee08620cade09e33fd203a44a7e8df5124 | |
| parent | d9337b72b2cdda5388b2b57cce49519a2f765fcc (diff) | |
| parent | 77c41c5d68f818c681935c991348e7ddaa07365b (diff) | |
| download | mullvadvpn-8d34e2c6f339c098a7da800321370367c17bfdb7.tar.xz mullvadvpn-8d34e2c6f339c098a7da800321370367c17bfdb7.zip | |
Merge branch 'fix-confusing-log'
| -rw-r--r-- | mullvad-daemon/src/lib.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs index 6501980585..ae680e7fcf 100644 --- a/mullvad-daemon/src/lib.rs +++ b/mullvad-daemon/src/lib.rs @@ -875,6 +875,8 @@ where // Wait for tunnel state machine to disconnect if !self.tunnel_state.is_disconnected() { + self.disconnect_tunnel(); + while let Some(event) = self.rx.next().await { if let InternalDaemonEvent::TunnelStateTransition(transition) = event { self.handle_tunnel_state_transition(transition).await; @@ -2642,7 +2644,7 @@ where if !user_init_shutdown && (*self.target_state == TargetState::Secured || self.settings.auto_connect) { - log::debug!("Blocking firewall during shutdown since system is going down"); + log::debug!("Blocking firewall during shutdown"); let (tx, _rx) = oneshot::channel(); self.send_tunnel_command(TunnelCommand::BlockWhenDisconnected(true, tx)); } |