Skip to content

Commit 1011c01

Browse files
committed
pref: 部分逻辑优化
1 parent 422013a commit 1011c01

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

app/main/handlers/newEngineStatus.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ module.exports = {
6060
killed = true
6161
cleanTask()
6262
clearTimeout(timeoutId)
63+
!timeOut && engineLogOutputFileAndUI(win, `----- 执行中止 check -----`)
6364
try {
64-
!timeOut && engineLogOutputFileAndUI(win, `----- 执行中止 check -----`)
6565
subprocess.kill()
6666
if (process.platform === "win32") {
6767
childProcess.exec(`taskkill /PID ${subprocess.pid} /T /F`)
@@ -287,8 +287,8 @@ module.exports = {
287287
killed = true
288288
cleanTask()
289289
clearTimeout(timeoutId)
290+
!timeOut && engineLogOutputFileAndUI(win, `----- 执行中止 修复数据库 -----`)
290291
try {
291-
!timeOut && engineLogOutputFileAndUI(win, `----- 执行中止 修复数据库 -----`)
292292
subprocess.kill()
293293
if (process.platform === "win32") {
294294
childProcess.exec(`taskkill /PID ${subprocess.pid} /T /F`)
@@ -552,8 +552,8 @@ module.exports = {
552552
cleanup()
553553
cleanTask()
554554
clearTimeout(timeoutId)
555+
!timeOut && engineLogOutputFileAndUI(win, `----- 执行中止 启动本地引擎 -----`)
555556
try {
556-
!timeOut && engineLogOutputFileAndUI(win, `----- 执行中止 启动本地引擎 -----`)
557557
subprocess.kill()
558558
if (process.platform === "win32") {
559559
childProcess.exec(`taskkill /PID ${subprocess.pid} /T /F`)

app/renderer/engine-link-startup/src/pages/StartupPage/index.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -557,8 +557,7 @@ export const StartupPage: React.FC = () => {
557557
try {
558558
res = await ipcRenderer.invoke(ipcEventPre + "cancel-all-tasks")
559559
} catch (e) {
560-
// IPC 异常:记录,但不打断取消节奏
561-
console.warn("cancel-all-tasks failed:", e)
560+
debugToPrintLog(`------ cancel-all-tasks failed: ${e}`)
562561
}
563562
if (!res || res.canceled === 0) {
564563
await new Promise((r) => setTimeout(r, 300))

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "yakit",
3-
"version": "1.4.5-1219",
3+
"version": "1.4.5-1226",
44
"description": "Yakit is for yaklang.io Electron GUI Entry",
55
"main": "app/main/index.js",
66
"scripts": {

0 commit comments

Comments
 (0)