fixup! feat(plugin): add async io for the plugin

laanwj · Mar 24, 2024 · 8fc1186 · 8fc1186
1 parent a42bb4d
commit 8fc1186
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/plugin/src/io.rs b/plugin/src/io.rs
@@ -55,14 +55,16 @@ impl AsyncIO {
 
                                 // Check if the buffer ends with double newline
                                 if buffer.ends_with("\n\n") {
+                                    drop(reader);
                                     break; // Exit the loop
                                 }
                             }
                             let Some(resp) = async_callback(buffer.clone()) else {
                                 continue;
                             };
-                            io::stdout().write_all(resp.as_bytes())?;
-                            io::stdout().flush()?;
+                            let mut writer = io::stdout().lock();
+                            writer.write_all(resp.as_bytes())?;
+                            writer.flush()?;
                         }
                     }
                     _ => unreachable!(),

diff --git a/plugin/src/plugin.rs b/plugin/src/plugin.rs
@@ -66,10 +66,10 @@ impl log::Log for Log {
 
     fn log(&self, record: &Record) {
         if self.enabled(record.metadata()) {
+            let mut writer = io::stdout().lock();
             let level: LogLevel = record.level().into();
             let msg = record.args();
 
-            let mut writer = io::stdout();
             let mut payload = init_payload();
             add_str(&mut payload, "level", &level.to_string());
             add_str(&mut payload, "message", &format!("{msg}"));
@@ -79,10 +79,8 @@ impl log::Log for Log {
                 method: "log".to_owned(),
                 params: payload,
             };
-            writer
-                .write_all(serde_json::to_string(&request).unwrap().as_bytes())
-                .unwrap();
-            writer.flush().unwrap();
+            let _ = writer.write_all(serde_json::to_string(&request).unwrap().as_bytes());
+            let _ = writer.flush();
         }
     }
 
@@ -114,7 +112,7 @@ impl<'a, T: 'a + Clone> Plugin<T> {
     }
 
     pub fn log(&self, level: LogLevel, msg: &str) {
-        let mut writer = io::stdout();
+        let mut writer = io::stdout().lock();
         let mut payload = init_payload();
         add_str(&mut payload, "level", &level.to_string());
         add_str(&mut payload, "message", msg);