Change to unix domain socket

src/cmd/interactive/handler.rs

@@ -11,7 +11,6 @@ use hyper::server::conn::Http;
 use hyper::service::Service;
 use hyper::Body;
 use tokio::net::UnixListener;
-// use tokio::runtime::Runtime;
 use tokio::task::JoinHandle;
 use tracing::instrument;
 
@@ -36,9 +35,6 @@ impl TodaServer {
     pub fn serve_interactive(&mut self, interactive_path: PathBuf) {
         let toda_rpc = self.toda_rpc.clone();
         self.task = Some(tokio::task::spawn(async move {
-            // Runtime::new()
-            //     .expect("Failed to create Tokio runtime")
-            //     .block_on(async {
             tracing::info!("TodaServer listener try binding {:?}", interactive_path);
             let unix_listener = UnixListener::bind(interactive_path).unwrap();
 
@@ -64,7 +60,6 @@ impl TodaServer {
                     }
                 }
             }
-            // })
         }));
     }
 }

src/hookfs/mod.rs

@@ -319,16 +319,13 @@ impl HookFs {
         self.enable_injection.store(true, Ordering::SeqCst);
     }
 
-    pub fn disable_injection(&self) {
+    pub async fn disable_injection(&self) {
         self.enable_injection.store(false, Ordering::SeqCst);
 
         // TODO: create a standalone runtime only for interrupt is too ugly.
         //       this RWLock is actually redundant, and the injector is rarely written.
-        let mut rt = tokio::runtime::Runtime::new().unwrap();
-        rt.block_on(async {
             let injector = self.injector.read().await;
             injector.interrupt();
-        });
     }
 
     pub fn rebuild_path<P: AsRef<Path>>(&self, path: P) -> Result<PathBuf> {

src/main.rs

@@ -162,26 +162,26 @@ async fn main() -> anyhow::Result<()> {
     };
 
     let (tx, _) = mpsc::channel();
-    if option.interactive_path.is_some() {
+    if let Some(path) = option.interactive_path.clone() {
         let hookfs = match &mount_injector {
             Ok(e) => Some(e.hookfs.clone()),
             Err(_) => None,
         };
         let mut toda_server =
             TodaServer::new(TodaRpc::new(Mutex::new(status), Mutex::new(tx), hookfs));
-        toda_server.serve_interactive(option.interactive_path.clone().unwrap());
+        toda_server.serve_interactive(path.clone());
 
         info!("waiting for signal to exit");
         let mut signals = Signals::from_kinds(&[SignalKind::interrupt(), SignalKind::terminate()])?;
         signals.wait().await;
 
-        // delete the unix socket file
-        std::fs::remove_file(option.interactive_path.clone().unwrap())?;
-
         info!("start to recover and exit");
         if let Ok(v) = mount_injector {
             resume(option, v)?;
         }
+
+        // delete the unix socket file
+        std::fs::remove_file(path.clone())?;
         exit(0);
     }
     Ok(())