From d94119efc857593f875284128d798789a38d4d7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Thu, 3 Dec 2020 16:04:23 +0100 Subject: [PATCH] tokio 1.0: delay -> sleep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit almost the same thing, new name(s), no longer Unpin Signed-off-by: Fabian Grünbichler --- src/server/rest.rs | 8 ++++---- src/tools/daemon.rs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/server/rest.rs b/src/server/rest.rs index 307f888e..04bdc5f9 100644 --- a/src/server/rest.rs +++ b/src/server/rest.rs @@ -385,7 +385,7 @@ pub async fn handle_api_request { if let Some(httperr) = err.downcast_ref::() { if httperr.code == StatusCode::UNAUTHORIZED { - tokio::time::delay_until(Instant::from_std(delay_unauth_time)).await; + tokio::time::sleep_until(Instant::from_std(delay_unauth_time)).await; } } (formatter.format_error)(err) @@ -708,7 +708,7 @@ async fn handle_request( // always delay unauthorized calls by 3 seconds (from start of request) let err = http_err!(UNAUTHORIZED, "authentication failed - {}", err); - tokio::time::delay_until(Instant::from_std(delay_unauth_time)).await; + tokio::time::sleep_until(Instant::from_std(delay_unauth_time)).await; return Ok((formatter.format_error)(err)); } } @@ -723,7 +723,7 @@ async fn handle_request( let auth_id = rpcenv.get_auth_id(); if !check_api_permission(api_method.access.permission, auth_id.as_deref(), &uri_param, user_info.as_ref()) { let err = http_err!(FORBIDDEN, "permission check failed"); - tokio::time::delay_until(Instant::from_std(access_forbidden_time)).await; + tokio::time::sleep_until(Instant::from_std(access_forbidden_time)).await; return Ok((formatter.format_error)(err)); } @@ -765,7 +765,7 @@ async fn handle_request( return Ok(get_index(Some(userid.clone()), Some(new_csrf_token), language, &api, parts)); }, _ => { - tokio::time::delay_until(Instant::from_std(delay_unauth_time)).await; + tokio::time::sleep_until(Instant::from_std(delay_unauth_time)).await; return Ok(get_index(None, None, language, &api, parts)); } } diff --git a/src/tools/daemon.rs b/src/tools/daemon.rs index 0e3a174a..d298bf16 100644 --- a/src/tools/daemon.rs +++ b/src/tools/daemon.rs @@ -331,17 +331,17 @@ async fn get_service_state(service: &str) -> Result { } async fn wait_service_is_state(service: &str, state: &str) -> Result<(), Error> { - tokio::time::delay_for(std::time::Duration::new(1, 0)).await; + tokio::time::sleep(std::time::Duration::new(1, 0)).await; while get_service_state(service).await? != state { - tokio::time::delay_for(std::time::Duration::new(5, 0)).await; + tokio::time::sleep(std::time::Duration::new(5, 0)).await; } Ok(()) } async fn wait_service_is_not_state(service: &str, state: &str) -> Result<(), Error> { - tokio::time::delay_for(std::time::Duration::new(1, 0)).await; + tokio::time::sleep(std::time::Duration::new(1, 0)).await; while get_service_state(service).await? == state { - tokio::time::delay_for(std::time::Duration::new(5, 0)).await; + tokio::time::sleep(std::time::Duration::new(5, 0)).await; } Ok(()) }