mirror of
https://github.com/siyuan-note/siyuan.git
synced 2026-01-01 14:28:49 +01:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
cad0f1030d
5 changed files with 26 additions and 13 deletions
|
|
@ -361,8 +361,6 @@
|
|||
})
|
||||
})
|
||||
})
|
||||
// 防止内核长时间不用被回收
|
||||
new WebSocket(`${window.location.protocol === "https:" ? "wss" : "ws"}://${window.location.host}/ws?app=siyuan&id=init`);
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -551,8 +551,8 @@ const initKernel = (initData) => {
|
|||
writeLog('booted kernel process [pid=' + kernelProcessPid + ']')
|
||||
|
||||
kernelProcess.on('close', (code) => {
|
||||
writeLog(`kernel exited with code [${code}]`)
|
||||
if (0 !== code) {
|
||||
writeLog(`kernel exited with code [${code}]`)
|
||||
switch (code) {
|
||||
case 20:
|
||||
showErrorWindow('⚠️ 数据库被锁定 The database is locked',
|
||||
|
|
|
|||
|
|
@ -495,7 +495,7 @@
|
|||
}, 6000)
|
||||
})
|
||||
}
|
||||
// 防止内核长时间不用被回收
|
||||
// 用于授权页保持连接,避免非常驻内存内核自动退出 https://github.com/siyuan-note/insider/issues/1099
|
||||
new WebSocket(`${window.location.protocol === "https:" ? "wss" : "ws"}://${window.location.host}/ws?app=siyuan&id=auth`);
|
||||
</script>
|
||||
</body>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue