Refactor cleanup functions to use async/await

pingora-core/src/apps/mod.rs

@@ -51,12 +51,7 @@ pub trait ServerApp {
     ) -> Option<Stream>;
 
     /// This callback will be called once after the service stops listening to its endpoints.
-    fn cleanup(&self) {}
-
-    /// This callback will be called once after the service stops listening to its endpoints.
-    ///
-    /// Used for async cleanup tasks.
-    async fn async_cleanup(&self) {}
+    async fn cleanup(&self) {}
 }
 
 /// This trait defines the interface of an HTTP application.
@@ -82,7 +77,7 @@ pub trait HttpServerApp {
         None
     }
 
-    fn http_cleanup(&self) {}
+    async fn http_cleanup(&self) {}
 }
 
 #[cfg_attr(not(doc_async_trait), async_trait)]
@@ -146,7 +141,7 @@ where
         }
     }
 
-    fn cleanup(&self) {
-        self.http_cleanup()
+    async fn cleanup(&self) {
+        self.http_cleanup().await;
     }
 }

pingora-core/src/services/listening.rs

@@ -205,8 +205,7 @@ impl<A: ServerApp + Send + Sync + 'static> ServiceTrait for Service<A> {
 
         futures::future::join_all(handlers).await;
         self.listeners.cleanup();
-        self.app_logic.cleanup();
-        self.app_logic.async_cleanup().await;
+        self.app_logic.cleanup().await;
     }
 
     fn name(&self) -> &str {

pingora-proxy/src/lib.rs

@@ -605,7 +605,7 @@ where
         self.process_request(session, ctx).await
     }
 
-    fn http_cleanup(&self) {
+    async fn http_cleanup(&self) {
         // Notify all keepalived requests blocking on read_request() to abort
         self.shutdown.notify_waiters();