[pbs-devel] [PATCH proxmox-backup 02/12] tokio 1.0: delay -> sleep

["Fabian Grünbichler" <f.gruenbichler@proxmox.com>]

almost the same thing, new name(s), no longer Unpin

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 src/bin/proxmox-backup-manager.rs | 2 +-
 src/bin/proxmox-backup-proxy.rs   | 6 +++---
 src/bin/proxmox-daily-update.rs   | 2 +-
 src/bin/proxmox-tape.rs           | 2 +-
 src/client/http_client.rs         | 2 +-
 src/server/rest.rs                | 8 ++++----
 src/tools/daemon.rs               | 8 ++++----
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/bin/proxmox-backup-manager.rs b/src/bin/proxmox-backup-manager.rs
index ff2a1dc1..c114079a 100644
--- a/src/bin/proxmox-backup-manager.rs
+++ b/src/bin/proxmox-backup-manager.rs
@@ -41,7 +41,7 @@ pub async fn wait_for_local_worker(upid_str: &str) -> Result<(), Error> {
 
     loop {
         if proxmox_backup::server::worker_is_active_local(&upid) {
-            tokio::time::delay_for(sleep_duration).await;
+            tokio::time::sleep(sleep_duration).await;
         } else {
             break;
         }
diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs
index 6414d646..2228253d 100644
--- a/src/bin/proxmox-backup-proxy.rs
+++ b/src/bin/proxmox-backup-proxy.rs
@@ -262,7 +262,7 @@ async fn run_task_scheduler() {
             Ok(d) => d,
             Err(err) => {
                 eprintln!("task scheduler: compute next minute failed - {}", err);
-                tokio::time::delay_until(tokio::time::Instant::from_std(Instant::now() + Duration::from_secs(60))).await;
+                tokio::time::sleep_until(tokio::time::Instant::from_std(Instant::now() + Duration::from_secs(60))).await;
                 continue;
             }
         };
@@ -286,7 +286,7 @@ async fn run_task_scheduler() {
             }
         }
 
-        tokio::time::delay_until(tokio::time::Instant::from_std(delay_target)).await;
+        tokio::time::sleep_until(tokio::time::Instant::from_std(delay_target)).await;
     }
 }
 
@@ -649,7 +649,7 @@ async fn run_stat_generator() {
 
         generate_host_stats(save).await;
 
-        tokio::time::delay_until(tokio::time::Instant::from_std(delay_target)).await;
+        tokio::time::sleep_until(tokio::time::Instant::from_std(delay_target)).await;
 
      }
 
diff --git a/src/bin/proxmox-daily-update.rs b/src/bin/proxmox-daily-update.rs
index b78d1643..99f5152e 100644
--- a/src/bin/proxmox-daily-update.rs
+++ b/src/bin/proxmox-daily-update.rs
@@ -14,7 +14,7 @@ async fn wait_for_local_worker(upid_str: &str) -> Result<(), Error> {
         if !proxmox_backup::server::worker_is_active_local(&upid) {
             break;
         }
-        tokio::time::delay_for(sleep_duration).await;
+        tokio::time::sleep(sleep_duration).await;
     }
     Ok(())
 }
diff --git a/src/bin/proxmox-tape.rs b/src/bin/proxmox-tape.rs
index 4850008a..d9a84060 100644
--- a/src/bin/proxmox-tape.rs
+++ b/src/bin/proxmox-tape.rs
@@ -65,7 +65,7 @@ pub async fn wait_for_local_worker(upid_str: &str) -> Result<(), Error> {
 
     loop {
         if worker_is_active_local(&upid) {
-            tokio::time::delay_for(sleep_duration).await;
+            tokio::time::sleep(sleep_duration).await;
         } else {
             break;
         }
diff --git a/src/client/http_client.rs b/src/client/http_client.rs
index 92df9572..7febbe51 100644
--- a/src/client/http_client.rs
+++ b/src/client/http_client.rs
@@ -345,7 +345,7 @@ impl HttpClient {
 
         let renewal_future = async move {
             loop {
-                tokio::time::delay_for(Duration::new(60*15,  0)).await; // 15 minutes
+                tokio::time::sleep(Duration::new(60*15,  0)).await; // 15 minutes
                 let (auth_id, ticket) = {
                     let authinfo = auth2.read().unwrap().clone();
                     (authinfo.auth_id, authinfo.ticket)
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<Env: RpcEnvironment, S: 'static + BuildHasher +
         Err(err) => {
             if let Some(httperr) = err.downcast_ref::<HttpError>() {
                 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<String, Error> {
 }
 
 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(())
 }
-- 
2.20.1