From d9563dcbe53a0075a6b13069b45239c304b3c7b9 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 20 Dec 2022 19:57:40 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E6=A1=8C=E9=9D=A2?= =?UTF-8?q?=E7=AB=AF=E6=8B=89=E8=B5=B7=E5=86=85=E6=A0=B8=20https://github.?= =?UTF-8?q?com/siyuan-note/siyuan/issues/6894?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/electron/main.js | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/app/electron/main.js b/app/electron/main.js index 7b9bd0847..d215f629e 100644 --- a/app/electron/main.js +++ b/app/electron/main.js @@ -872,6 +872,19 @@ const isOnline = async () => { } let kernelPort = 6806 + +const getKernelPort = async () => { + if (isDevEnv) { + writeLog("got kernel port [" + kernelPort + "]") + return kernelPort + } + + // 改进桌面端拉起内核 https://github.com/siyuan-note/siyuan/issues/6894 + kernelPort = await getAvailablePort() + writeLog("got kernel available port [" + kernelPort + "]") + return kernelPort +} + let tryGetPortCount = 0 const net = require("net"); const getAvailablePort = (port = kernelPort) => { @@ -895,18 +908,6 @@ const getAvailablePort = (port = kernelPort) => { .listen(port, '127.0.0.1')) } -const getKernelPort = async () => { - if (isDevEnv) { - writeLog("got kernel port [" + kernelPort + "]") - return kernelPort - } - - // 改进桌面端拉起内核 https://github.com/siyuan-note/siyuan/issues/6894 - kernelPort = await getAvailablePort() - writeLog("got kernel available port [" + kernelPort + "]") - return kernelPort -} - const getServer = () => { return "http://" + localhost + ":" + kernelPort }