Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:recycle: Remove the superseded kernel boot entry https://github.com/siyuan-note/siyuan/issues/20239

Daniel4207ea24dae7
diff --git a/kernel/cli/cmd/root.go b/kernel/cli/cmd/root.go
index 8e80b60e1a..a4a1cc14e8 100644
--- a/kernel/cli/cmd/root.go
+++ b/kernel/cli/cmd/root.go
@@ -297,12 +297,3 @@ func init() {
func Execute() error {
return rootCmd.Execute()
}
-
-func HasSubCommand(name string) bool {
- for _, c := range rootCmd.Commands() {
- if c.Name() == name {
- return true
- }
- }
- return false
-}
diff --git a/kernel/cli/cmd/serve.go b/kernel/cli/cmd/serve.go
index 644aa628e1..02b4c7df04 100644
--- a/kernel/cli/cmd/serve.go
+++ b/kernel/cli/cmd/serve.go
@@ -61,7 +61,7 @@ var serveCmd = &cobra.Command{
return nil // bypass root's init — BootWithFlags() handles it
},
Run: func(cmd *cobra.Command, args []string) {
- // --workspace 优先取 serve 自己的(rootCmd 的 persistent flag),兜底环境变量与默认值交给 util.BootWithFlags 内部处理(与原 Boot() 行为一致)。
+ // --workspace 使用 rootCmd 的 persistent flag,环境变量回退与默认值由 util.BootWithFlags 处理。
ws := workspacePath
util.BootWithFlags(ws, serveWdPath, servePort, serveReadOnly, serveAccessAuthCode, serveLang, serveMode, serveSSL, serveAttachUI, serveSafeMode, serveEnablePprof)
diff --git a/kernel/util/working.go b/kernel/util/working.go
index b50e3b5314..8c6dbb160e 100644
--- a/kernel/util/working.go
+++ b/kernel/util/working.go
@@ -18,7 +18,6 @@ package util
import (
"errors"
- "flag"
"fmt"
"mime"
"net/http"
@@ -120,33 +119,7 @@ func InitWorkspace(workspacePath, wdPath string) {
LogPath = filepath.Join(TempDir, "siyuan.log")
}
-func Boot() {
- IncBootProgress(3, BootL10n(299, "Booting kernel..."))
-
- // 由标准库 flag 解析 os.Args,再走统一的 BootWithFlags。
- homeDirPath := flag.String("home-dir", "", "base directory for user configuration (defaults to the system user home)")
- workspacePath := flag.String("workspace", "", "dir path of the workspace, default to ~/SiYuan/")
- wdPath := flag.String("wd", WorkingDir, "working directory of SiYuan")
- port := flag.String("port", "0", "port of the HTTP server")
- readOnly := flag.String("readonly", "false", "read-only mode")
- accessAuthCode := flag.String("accessAuthCode", "", "access auth code")
- ssl := flag.Bool("ssl", false, "for https and wss")
- attachUI := flag.Bool("attach-ui", false, "attach kernel lifecycle to desktop UI process (used by Electron)")
- lang := flag.String("lang", "", "ar/de/en/es/fr/he/hi/id/it/ja/ko/nl/pl/pt-BR/ru/sk/sr/th/tr/uk/zh-CN/zh-TW")
- mode := flag.String("mode", "prod", "dev/prod")
- enablePprof := flag.Bool("enable-pprof", false, "enable unauthenticated /debug/pprof/ endpoints (dev only, never on a network-exposed instance)")
- safeMode := flag.Bool("safe-mode", false, "boot in safe mode")
- flag.Parse()
-
- if err := SetHomeDir(*homeDirPath); err != nil {
- fmt.Fprintln(os.Stderr, err)
- os.Exit(logging.ExitCodeInitWorkspaceErr)
- }
-
- BootWithFlags(*workspacePath, *wdPath, *port, *readOnly, *accessAuthCode, *lang, *mode, *ssl, *attachUI, *safeMode, *enablePprof)
-}
-
-// BootWithFlags 接收已解析好的启动参数,完成环境变量回退、全局变量赋值、工作空间初始化与加锁等启动收尾工作。Boot()(标准库 flag 解析)和 serve 子命令(cobra 解析)都走这个统一入口。
+// BootWithFlags 接收已解析的启动参数,完成环境变量回退、全局变量赋值、工作空间初始化与加锁。
func BootWithFlags(workspacePath, wdPath, port, readOnly, accessAuthCode, lang, mode string, ssl, attachUI, safeMode, enablePprof bool) {
SafeMode = safeMode
EnablePprof = enablePprof
diff --git a/kernel/util/working_home_test.go b/kernel/util/working_home_test.go
index e65d4ff9f0..995e58e7f2 100644
--- a/kernel/util/working_home_test.go
+++ b/kernel/util/working_home_test.go
@@ -125,11 +125,11 @@ func TestBootHomeDir(t *testing.T) {
command.Env = append(os.Environ(), "SIYUAN_TEST_BOOT_HOME="+oldHome)
output, err := command.CombinedOutput()
if err != nil {
- t.Fatalf("Boot() failed: %v\n%s", err, output)
+ t.Fatalf("BootWithFlags failed: %v\n%s", err, output)
}
for _, expected := range []string{"HOME_DIR=" + home, "WORKSPACE=" + workspace, "WD=" + wd} {
if !strings.Contains(string(output), expected) {
- t.Fatalf("missing %q in Boot() output:\n%s", expected, output)
+ t.Fatalf("missing %q in BootWithFlags output:\n%s", expected, output)
}
}
registry := filepath.Join(home, ".config", "siyuan", "workspace.json")
@@ -154,8 +154,17 @@ func TestBootHomeDirProcess(t *testing.T) {
break
}
}
- flag.CommandLine = flag.NewFlagSet("home-dir-test", flag.ExitOnError)
- Boot()
+ flags := flag.NewFlagSet("home-dir-test", flag.ContinueOnError)
+ home := flags.String("home-dir", "", "")
+ workspace := flags.String("workspace", "", "")
+ wd := flags.String("wd", "", "")
+ if err := flags.Parse(os.Args[1:]); err != nil {
+ t.Fatal(err)
+ }
+ if err := SetHomeDir(*home); err != nil {
+ t.Fatal(err)
+ }
+ BootWithFlags(*workspace, *wd, "0", "false", "", "", "prod", false, false, false, false)
defer UnlockWorkspace()
fmt.Printf("HOME_DIR=%s\nWORKSPACE=%s\nWD=%s\n", HomeDir, WorkspaceDir, WorkingDir)
cwd, err := os.Getwd()
@@ -194,11 +203,11 @@ func TestBootWorkingDir(t *testing.T) {
command.Env = append(os.Environ(), "SIYUAN_TEST_BOOT_HOME="+filepath.Join(root, "system-home"))
output, err := command.CombinedOutput()
if err != nil {
- t.Fatalf("Boot() failed: %v\n%s", err, output)
+ t.Fatalf("BootWithFlags failed: %v\n%s", err, output)
}
for _, expected := range []string{"WD=" + test.want + "\n", "CWD=" + launcher + "\n"} {
if !strings.Contains(string(output), expected) {
- t.Fatalf("missing %q in Boot() output:\n%s", expected, output)
+ t.Fatalf("missing %q in BootWithFlags output:\n%s", expected, output)
}
}
})