🎨 桌面端支持同时打开多个工作空间 https://github.com/siyuan-note/siyuan/issues/4567
This commit is contained in:
parent
ae11242a19
commit
7f7386b21f
3 changed files with 4 additions and 4 deletions
|
@ -550,7 +550,7 @@ const initKernel = (initData) => {
|
|||
switch (code) {
|
||||
case 20:
|
||||
showErrorWindow('⚠️ 数据库被锁定 The database is locked',
|
||||
`<div>数据库文件正在被其他进程占用,请检查是否同时存在多个内核进程(SiYuan Kernel)。</div><div>The database file is being occupied by other processes, please check whether there are multiple kernel processes (SiYuan Kernel) at the same time.</div>`)
|
||||
`<div>数据库文件正在被其他进程占用,请检查是否同时存在多个内核进程(SiYuan Kernel)服务相同的工作空间。</div><div>The database file is being occupied by other processes, please check whether there are multiple kernel processes (SiYuan Kernel) serving the same workspace at the same time.</div>`)
|
||||
break
|
||||
case 21:
|
||||
showErrorWindow('⚠️ 监听端口 ' + kernelPort + ' 失败 Failed to listen to port ' + kernelPort,
|
||||
|
|
|
@ -530,7 +530,7 @@ func FullReindex() {
|
|||
WaitForWritingFiles()
|
||||
|
||||
if err := sql.InitDatabase(true); nil != err {
|
||||
util.PushErrMsg(fmt.Sprintf(Conf.Language(85), err), 5000)
|
||||
os.Exit(util.ExitCodeReadOnlyDatabase)
|
||||
return
|
||||
}
|
||||
treenode.InitBlockTree(true)
|
||||
|
|
|
@ -118,9 +118,9 @@ func Serve(fastMode bool) {
|
|||
// 启动一个 6806 端口的反向代理服务器,这样浏览器扩展才能直接使用 127.0.0.1:6806,不用配置端口
|
||||
serverURL, _ := url.Parse("http://" + host + ":" + port)
|
||||
proxy := httputil.NewSingleHostReverseProxy(serverURL)
|
||||
logging.LogInfof("kernel reverse proxy server [%s] is booting", util.FixedPort)
|
||||
logging.LogInfof("reverse proxy server [%s] is booting", util.FixedPort)
|
||||
if proxyErr := http.ListenAndServe(host+":"+util.FixedPort, proxy); nil != proxyErr {
|
||||
logging.LogErrorf("boot kernel reverse proxy server [%s] failed: %s", serverURL, proxyErr)
|
||||
logging.LogWarnf("boot reverse proxy server [%s] failed: %s", serverURL, proxyErr)
|
||||
}
|
||||
// 反代服务器启动失败不影响核心服务器启动
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue