Skip to content

Commit a662e88

Browse files
committed
fix(main):1.12.30, 修复main后端运行时,执行/dump/conf时出现退出问题
1 parent 22595bd commit a662e88

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

modules/main/run_in_backend.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ struct Runtime {
5757
Log log;
5858
ContextImp ctx;
5959
Module apps;
60+
Json js_conf;
6061

6162
util::PidFile pid_file;
6263
int exit_wait_sec = 1;
@@ -125,8 +126,8 @@ bool Start(int argc, char **argv)
125126
auto &log = _runtime->log;
126127
auto &ctx = _runtime->ctx;
127128
auto &apps = _runtime->apps;
129+
auto &js_conf = _runtime->js_conf;
128130

129-
Json js_conf;
130131
Args args(js_conf);
131132
Trace trace;
132133

version.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@
2121
# TBOX版本号
2222
TBOX_VERSION_MAJOR := 1
2323
TBOX_VERSION_MINOR := 12
24-
TBOX_VERSION_REVISION := 29
24+
TBOX_VERSION_REVISION := 30

0 commit comments

Comments
 (0)