1、增加LOG_LEVEL环境变量处理逻辑

2、aot处理阶段不执行初始化数据库的逻辑
This commit is contained in:
aoshiguchen
2023-10-26 21:24:43 +08:00
parent 03a9d2e971
commit cb9aa5da81
5 changed files with 18 additions and 4 deletions
@@ -3,6 +3,7 @@ package org.dromara.neutrinoproxy.client;
import cn.hutool.core.util.StrUtil;
import lombok.extern.slf4j.Slf4j;
import org.noear.solon.Solon;
import org.noear.solon.Utils;
import org.noear.solon.annotation.SolonMain;
/**
@@ -16,6 +17,11 @@ public class ProxyClient {
public static void main(String[] args) {
Solon.start(ProxyClient.class, args, app -> {
String loglevel = System.getenv("LOG_LEVEL");
if (Utils.isNotEmpty(loglevel)) {
app.cfg().put("solon.logging.logger.root.level", loglevel);
}
setAlias("neutrino.proxy.tunnel.server-ip", "serverIp");
setAlias("neutrino.proxy.tunnel.server-port", "serverPort");
setAlias("neutrino.proxy.tunnel.ssl-enable", "sslEnable");
@@ -12,7 +12,6 @@ solon.logging.appender:
rolling: "logs/${neutrino.application.name}_%d{yyyy-MM-dd}_%i.log.gz"
solon.logging.logger:
"root":
# level: ${LOG_LEVEL:info}
level: info
neutrino:
application:
@@ -2,7 +2,9 @@ package org.dromara.neutrinoproxy.server;
import lombok.extern.slf4j.Slf4j;
import org.dromara.solonplugins.job.annotation.EnableJob;
import org.noear.snack.core.utils.StringUtil;
import org.noear.solon.Solon;
import org.noear.solon.Utils;
import org.noear.solon.annotation.SolonMain;
import org.noear.solon.web.cors.CrossFilter;
@@ -20,6 +22,10 @@ public class ProxyServer {
Solon.start(ProxyServer.class, args, app -> {
// 跨域支持。加-1 优先级更高
app.filter(-1, new CrossFilter().allowedOrigins("*"));
String loglevel = System.getenv("LOG_LEVEL");
if (Utils.isNotEmpty(loglevel)) {
app.cfg().put("solon.logging.logger.root.level", loglevel);
}
});
}
}
@@ -33,6 +33,7 @@ import org.noear.solon.annotation.Init;
import org.noear.solon.annotation.Inject;
import org.noear.solon.core.event.AppLoadEndEvent;
import org.noear.solon.core.event.EventListener;
import org.noear.solon.core.runtime.NativeDetector;
import org.noear.wood.DbContext;
import org.noear.wood.annotation.Db;
@@ -57,6 +58,10 @@ public class DBInitialize implements EventListener<AppLoadEndEvent> {
@Init
public void init() throws Throwable {
// aot 阶段,不初始化数据库
if (NativeDetector.isAotRuntime()) {
return;
}
Assert.notNull(dbConfig.getType(), "neutrino.data.db.type不能为空!");
dbTypeEnum = DbTypeEnum.of(dbConfig.getType());
Assert.notNull(dbTypeEnum, "neutrino.data.db.type取值异常!");
@@ -20,9 +20,7 @@ solon.logging.appender:
rolling: "logs/${solon.app.name}_%d{yyyy-MM-dd}_%i.log"
solon.logging.logger:
"root":
level: ${LOG_LEVEL:info}
# level: info
level: info
neutrino:
proxy: