From 35007a3e6e83568a64f4577f4f55783be7166487 Mon Sep 17 00:00:00 2001 From: shy Date: Sat, 2 Dec 2023 11:13:29 +0800 Subject: [PATCH] add boot --- base/cli/runtime.go | 3 ++- base/web/dream.go | 2 +- info.go | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/base/cli/runtime.go b/base/cli/runtime.go index 44b9f56a..a50c596f 100644 --- a/base/cli/runtime.go +++ b/base/cli/runtime.go @@ -132,6 +132,7 @@ const ( CTX_COM = "ctx_com" CTX_OPS = "ctx_ops" CTX_DEMO = "ctx_demo" + CTX_ROOT = "ctx_root" CTX_MAIL = "ctx_mail" CTX_PID = "ctx_pid" @@ -140,7 +141,7 @@ const ( CTX_ENV = "ctx_env" ) -var ENV_LIST = []string{TZ, LANG, TERM, SHELL, CTX_SHY, CTX_DEV, CTX_HUB, CTX_COM, CTX_OPS, CTX_DEMO, CTX_MAIL, CTX_PID} +var ENV_LIST = []string{TZ, LANG, TERM, SHELL, CTX_SHY, CTX_DEV, CTX_HUB, CTX_COM, CTX_OPS, CTX_ROOT, CTX_DEMO, CTX_MAIL, CTX_PID} const ( HOSTNAME = "hostname" diff --git a/base/web/dream.go b/base/web/dream.go index 42d5dba0..91f556af 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -75,7 +75,7 @@ func _dream_start(m *ice.Message, name string) { defer m.Sleep3s() m.Options(cli.CMD_DIR, kit.Path(p), cli.CMD_ENV, kit.EnvList(kit.Simple( cli.CTX_OPS, Domain(tcp.LOCALHOST, m.Cmdv(SERVE, tcp.PORT)), cli.CTX_LOG, ice.VAR_LOG_BOOT_LOG, cli.CTX_PID, ice.VAR_LOG_ICE_PID, - cli.PATH, cli.BinPath(p, ""), cli.USER, ice.Info.Username, + cli.CTX_ROOT, kit.Path(""), cli.PATH, cli.BinPath(p, ""), cli.USER, ice.Info.Username, )...), cli.CMD_OUTPUT, path.Join(p, ice.VAR_LOG_BOOT_LOG), mdb.CACHE_CLEAR_ONEXIT, ice.TRUE) defer m.Options(cli.CMD_DIR, "", cli.CMD_ENV, "", cli.CMD_OUTPUT, "") gdb.Event(m, DREAM_CREATE, m.OptionSimple(mdb.NAME, mdb.TYPE)) diff --git a/info.go b/info.go index 62bc5e86..00f05998 100644 --- a/info.go +++ b/info.go @@ -56,6 +56,7 @@ var Info = struct { Hostname string Pathname string PidPath string + CtxRoot string Traceid string Colors bool Pwd string @@ -105,6 +106,7 @@ var Info = struct { func init() { Info.Pwd = kit.Path("") + Info.CtxRoot = kit.Env("ctx_root") Info.Traceid = os.Getenv(LOG_TRACE) } func AddMergeAction(h ...Any) {