summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2024-07-18 14:43:18 +0200
committerLinus Färnstrand <linus@mullvad.net>2024-07-18 14:43:18 +0200
commit3218b4647118af77b5cd6d142b58bc65436c6159 (patch)
tree93f20c2e365a8898151827f9044bcb4f995ab43d
parent3f2ff89459655b8010bc16628127b6b3d0973a32 (diff)
parent860ad9704778e0d3656b54d4b53534b7a2708da7 (diff)
downloadmullvadvpn-3218b4647118af77b5cd6d142b58bc65436c6159.tar.xz
mullvadvpn-3218b4647118af77b5cd6d142b58bc65436c6159.zip
Merge branch 'status-listen-bug'
-rw-r--r--CHANGELOG.md3
-rw-r--r--mullvad-cli/src/cmds/status.rs3
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1a0956b72..35190b4ce1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,9 @@ Line wrap the file at 100 chars. Th
- Update Electron from 28.1.3 to 30.0.4.
### Fixed
+- Fix mullvad cli bug causing `mullvad status listen` command to miss events if they occurred
+ too quickly.
+
#### Windows
- Fix race condition that could result in crashes when DAITA was enabled during disconnects.
diff --git a/mullvad-cli/src/cmds/status.rs b/mullvad-cli/src/cmds/status.rs
index 8880c4c69c..939beeca4a 100644
--- a/mullvad-cli/src/cmds/status.rs
+++ b/mullvad-cli/src/cmds/status.rs
@@ -27,7 +27,8 @@ impl Status {
pub async fn listen(mut rpc: MullvadProxyClient, args: StatusArgs) -> Result<()> {
let mut previous_tunnel_state = None;
- while let Some(event) = rpc.events_listen().await?.next().await {
+ let mut event_stream = rpc.events_listen().await?;
+ while let Some(event) = event_stream.next().await {
match event? {
DaemonEvent::TunnelState(new_state) => {
if args.debug {