Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-20 16:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 文件系统读取或写入失败时退出内核 https://github.com/siyuan-note/siyuan/issues/7707

Browse source
This commit is contained in:
Liang Ding 2023-03-19 10:24:05 +08:00
parent c8cef8f455
commit 359b319ef6
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/electron/main.js
View file

@ -75,7 +75,7 @@ const exitApp = (type, id) => {
} }
} else { } else {
const currentURL = new URL(item.browserWindow.getURL()); const currentURL = new URL(item.browserWindow.getURL());
if (currentURL.port === id) { if (currentURL.port === id || currentURL.port === id.toString()) {
mainWindow = item.browserWindow; mainWindow = item.browserWindow;
if (workspaces.length > 1) { if (workspaces.length > 1) {
item.browserWindow.destroy(); item.browserWindow.destroy();
@ -486,7 +486,6 @@ const initKernel = (workspace, port, lang) => {
let cmd = `ui version [${appVer}], booting kernel [${kernelPath} ${cmds.join( let cmd = `ui version [${appVer}], booting kernel [${kernelPath} ${cmds.join(
" ")}]`; " ")}]`;
writeLog(cmd); writeLog(cmd);
let kernelProcessPid = "";
if (!isDevEnv || workspaces.length > 0) { if (!isDevEnv || workspaces.length > 0) {
const cp = require("child_process"); const cp = require("child_process");
const kernelProcess = cp.spawn(kernelPath, const kernelProcess = cp.spawn(kernelPath,
@ -495,12 +494,13 @@ const initKernel = (workspace, port, lang) => {
stdio: "ignore", stdio: "ignore",
}, },
); );
kernelProcessPid = kernelProcess.pid;
writeLog("booted kernel process [pid=" + kernelProcessPid + ", port=" + const currentKernelPid = kernelProcess.pid;
kernelPort + "]"); const currentKernelPort = kernelPort;
writeLog("booted kernel process [pid=" + currentKernelPid + ", port=" + currentKernelPort + "]");
kernelProcess.on("close", (code) => { kernelProcess.on("close", (code) => {
writeLog(`kernel [pid=${kernelProcessPid}] exited with code [${code}]`); writeLog(`kernel [pid=${currentKernelPid}, port=${currentKernelPort}] exited with code [${code}]`);
if (0 !== code) { if (0 !== code) {
switch (code) { switch (code) {
case 20: case 20:
@ -550,7 +550,7 @@ const initKernel = (workspace, port, lang) => {
break; break;
} }
exitApp("port", kernelPort); exitApp("port", currentKernelPort);
bootWindow.destroy(); bootWindow.destroy();
resolve(false); resolve(false);
} }