From 7f7386b21f48ba36876796099a765a985a398e01 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Wed, 7 Dec 2022 18:21:54 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E6=A1=8C=E9=9D=A2=E7=AB=AF=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=90=8C=E6=97=B6=E6=89=93=E5=BC=80=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4=20https://github.com/siyua?=
 =?UTF-8?q?n-note/siyuan/issues/4567?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/electron/main.js   | 2 +-
 kernel/model/box.go    | 2 +-
 kernel/server/serve.go | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/electron/main.js b/app/electron/main.js
index cdca57ade..faae062be 100644
--- a/app/electron/main.js
+++ b/app/electron/main.js
@@ -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,
diff --git a/kernel/model/box.go b/kernel/model/box.go
index e6fee5e2b..f6ef21498 100644
--- a/kernel/model/box.go
+++ b/kernel/model/box.go
@@ -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)
diff --git a/kernel/server/serve.go b/kernel/server/serve.go
index 0ac7ab2f6..d5e68ee06 100644
--- a/kernel/server/serve.go
+++ b/kernel/server/serve.go
@@ -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)
 			}
 			// 反代服务器启动失败不影响核心服务器启动
 		}