diff options
| author | David Lönnhager <david.l@mullvad.net> | 2021-07-08 17:03:14 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2021-07-13 15:57:39 +0200 |
| commit | 0bc3b0b9bc65a0e50081dee83a37bb9979974300 (patch) | |
| tree | 3546c91b02b8df8bb9b30eb465a7527fa6d58097 | |
| parent | aa24d8a7e45f5712e380bacd57c3e463a6f9a006 (diff) | |
| download | mullvadvpn-0bc3b0b9bc65a0e50081dee83a37bb9979974300.tar.xz mullvadvpn-0bc3b0b9bc65a0e50081dee83a37bb9979974300.zip | |
Wrap IntervalStream around tokio interval objects
| -rw-r--r-- | mullvad-daemon/src/relays.rs | 5 | ||||
| -rw-r--r-- | mullvad-daemon/src/settings.rs | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mullvad-daemon/src/relays.rs b/mullvad-daemon/src/relays.rs index 0fdb6ebba9..54b56cde5f 100644 --- a/mullvad-daemon/src/relays.rs +++ b/mullvad-daemon/src/relays.rs @@ -994,7 +994,10 @@ impl RelayListUpdater { } async fn run(mut self, mut cmd_rx: mpsc::Receiver<()>) { - let mut check_interval = tokio::time::interval(UPDATE_CHECK_INTERVAL).fuse(); + let mut check_interval = tokio_stream::wrappers::IntervalStream::new( + tokio::time::interval(UPDATE_CHECK_INTERVAL), + ) + .fuse(); let mut download_future = Box::pin(Fuse::terminated()); loop { futures::select! { diff --git a/mullvad-daemon/src/settings.rs b/mullvad-daemon/src/settings.rs index e789337699..02568e3226 100644 --- a/mullvad-daemon/src/settings.rs +++ b/mullvad-daemon/src/settings.rs @@ -149,7 +149,6 @@ impl SettingsPersister { let mut options = fs::OpenOptions::new(); #[cfg(unix)] { - use fs::os::unix::OpenOptionsExt; options.mode(0o600); } let mut file = options |