summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2020-05-15 12:02:25 +0200
committerLinus Färnstrand <linus@mullvad.net>2020-05-15 12:02:25 +0200
commitffa654e0c0bb7e8be53adf30a4edf40274d6ff60 (patch)
tree63b6508f102e5fff06080a1f5905eb24dc5749a6
parentf4a9b1de419520fb67dc4fdd7fca777389b93ba8 (diff)
parent51a01640640a9f744d0d1c2337d6ea0acd0ac3b7 (diff)
downloadmullvadvpn-ffa654e0c0bb7e8be53adf30a4edf40274d6ff60.tar.xz
mullvadvpn-ffa654e0c0bb7e8be53adf30a4edf40274d6ff60.zip
Merge branch 'increase-network-failure-retry-intervals'
-rw-r--r--mullvad-daemon/src/relays.rs4
-rw-r--r--mullvad-daemon/src/wireguard.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/mullvad-daemon/src/relays.rs b/mullvad-daemon/src/relays.rs
index 94e6c66cf9..44c1d7ef90 100644
--- a/mullvad-daemon/src/relays.rs
+++ b/mullvad-daemon/src/relays.rs
@@ -38,9 +38,9 @@ const DOWNLOAD_TIMEOUT: Duration = Duration::from_secs(15);
/// How often the updater should wake up to check the cache of the in-memory cache of relays.
/// This check is very cheap. The only reason to not have it very often is because if downloading
/// constantly fails it will try very often and fill the logs etc.
-const UPDATE_CHECK_INTERVAL: Duration = Duration::from_secs(60 * 5);
+const UPDATE_CHECK_INTERVAL: Duration = Duration::from_secs(60 * 15);
/// How old the cached relays need to be to trigger an update
-const UPDATE_INTERVAL: Duration = Duration::from_secs(3600);
+const UPDATE_INTERVAL: Duration = Duration::from_secs(60 * 60);
#[derive(err_derive::Error, Debug)]
#[error(no_from)]
diff --git a/mullvad-daemon/src/wireguard.rs b/mullvad-daemon/src/wireguard.rs
index 5cc4b9be7d..3e928827be 100644
--- a/mullvad-daemon/src/wireguard.rs
+++ b/mullvad-daemon/src/wireguard.rs
@@ -20,7 +20,7 @@ use tokio_timer;
/// Default automatic key rotation
const DEFAULT_AUTOMATIC_KEY_ROTATION: Duration = Duration::from_secs(7 * 24 * 60 * 60);
/// How long to wait before reattempting to rotate keys on failure
-const AUTOMATIC_ROTATION_RETRY_DELAY: Duration = Duration::from_secs(5);
+const AUTOMATIC_ROTATION_RETRY_DELAY: Duration = Duration::from_secs(60 * 15);
/// How often to check whether the key has expired.
/// A short interval is used in case the computer is ever suspended.
const KEY_CHECK_INTERVAL: Duration = Duration::from_secs(60);