fix(executor-manager): 日志改为动态配置

This commit is contained in:
v-zhangjc9
2024-05-17 18:05:01 +08:00
parent f398b8cdc3
commit fd9f97d03b
4 changed files with 13 additions and 1 deletions

View File

@@ -16,9 +16,18 @@ import org.springframework.stereotype.Component;
public class ExecutorConfiguration {
private static final Logger logger = LoggerFactory.getLogger(ExecutorConfiguration.class);
private String lokiPushUrl;
private String taskJarPath;
private String taskResultPath;
public String getLokiPushUrl() {
return lokiPushUrl;
}
public void setLokiPushUrl(String lokiPushUrl) {
this.lokiPushUrl = lokiPushUrl;
}
public String getTaskJarPath() {
return taskJarPath;
}

View File

@@ -8,6 +8,7 @@ import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.lanyuanxiaoyao.service.common.Constants;
import com.lanyuanxiaoyao.service.executor.Runner;
import com.lanyuanxiaoyao.service.executor.core.TaskConstants;
import com.lanyuanxiaoyao.service.executor.core.TaskContext;
@@ -133,6 +134,7 @@ public class ExecutorTaskService {
configuration.setString(YarnConfigOptions.APPLICATION_NAME, StrUtil.format("Service_Task {} #{}", name, taskId));
setEnvironment(configuration, "task_id", taskId);
setEnvironment(configuration, Constants.LOKI_PUSH_URL, executorConfiguration.getLokiPushUrl());
// 业务jar包
String executorJarPath = getLatestExecutorJarPath();

View File

@@ -3,7 +3,7 @@
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>INFO</level>
</filter>
<url>http://132.126.207.126:33100/loki/api/v1/push</url>
<url>${loki_push_url:- }</url>
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [${HOSTNAME}] %-5level ${PID:- } --- [%t] %-40.40logger{39} #@# : %m%n</pattern>
</encoder>