starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-03-22 17:39:12 +01:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Log when plugin runtime exits

Browse Source
This commit is contained in:
Gregory Schier
2024-07-25 09:28:08 -07:00
parent 97947e5680
commit 203cbc5788
3 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src-tauri/tauri-plugin-plugin-runtime/src/nodejs.rs
View File

@@ -2,8 +2,8 @@ use std::path::PathBuf;
use std::process::Command;
use std::time::Duration;
use command_group::{CommandGroup, GroupChild};
use log::{debug, info};
use command_group::CommandGroup;
use log::{debug, error, info};
use rand::distributions::{Alphanumeric, DistString};
use serde;
use serde::Deserialize;
@@ -11,6 +11,7 @@ use tauri::path::BaseDirectory;
use tauri::{AppHandle, Manager, Runtime};
use tauri_plugin_shell::ShellExt;
use tokio::fs;
use tokio::sync::watch::Receiver;
#[derive(Deserialize, Default)]
#[serde(default, rename_all = "camelCase")]
@@ -20,10 +21,13 @@ struct PortFile {
pub struct StartResp {
pub addr: String,
pub child: GroupChild,
}
pub async fn node_start<R: Runtime>(app: &AppHandle<R>, temp_dir: &PathBuf) -> StartResp {
pub async fn node_start<R: Runtime>(
app: &AppHandle<R>,
temp_dir: &PathBuf,
kill_rx: &Receiver<bool>,
) -> StartResp {
let port_file_path = temp_dir.join(Alphanumeric.sample_string(&mut rand::thread_rng(), 10));
let plugins_dir = app
@@ -47,7 +51,7 @@ pub async fn node_start<R: Runtime>(app: &AppHandle<R>, temp_dir: &PathBuf) -> S
.to_string();
info!(
"Starting plugin runtime\n port_file={}\n plugins_dir={}\n runtime_dir={}",
"Starting plugin runtime\n → port_file={}\n → plugins_dir={}\n → runtime_dir={}",
port_file_path.to_string_lossy(),
plugins_dir,
plugin_runtime_main,
@@ -61,10 +65,28 @@ pub async fn node_start<R: Runtime>(app: &AppHandle<R>, temp_dir: &PathBuf) -> S
.env("YAAK_PLUGINS_DIR", plugins_dir)
.args(&[plugin_runtime_main]);
let child = Command::from(cmd)
println!("Waiting on plugin runtime");
let mut child = Command::from(cmd)
.group_spawn()
.expect("yaaknode failed to start");
let kill_rx = kill_rx.clone();
// Check on child
tokio::spawn(async move {
loop {
if let Ok(Some(status)) = child.try_wait() {
error!("Plugin runtime exited status={}", status);
// TODO: Try restarting plugin runtime
break;
} else if *kill_rx.borrow() {
info!("Stopping plugin runtime");
child.kill().expect("Failed to kill plugin runtime");
break;
}
}
});
let start = std::time::Instant::now();
let port_file_contents = loop {
if start.elapsed().as_millis() > 30000 {
@@ -84,5 +106,5 @@ pub async fn node_start<R: Runtime>(app: &AppHandle<R>, temp_dir: &PathBuf) -> S
info!("Started plugin runtime on :{}", port_file.port);
let addr = format!("http://localhost:{}", port_file.port);
StartResp { addr, child }
StartResp { addr }
}