Browse Source

Merge remote-tracking branch 'remotes/origin/release'

dev_shibei_match
jianjun 5 years ago
parent
commit
a05a5f7eda
  1. 60
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/log/controller/LogbackController.java
  2. 7
      epmet-module/data-statistical/data-statistical-server/pom.xml
  3. 6
      epmet-module/epmet-job/epmet-job-server/pom.xml

60
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/log/controller/LogbackController.java

@ -1,8 +1,8 @@
package com.epmet.commons.tools.log.controller;
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.LoggerContext;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
* logback日志级别动态切换
* 请求路径 .../log/setlevel
* 根据参数(levelpackageName)设置某一个包或者具体的某一个类的日志打印级别
*
* @Auther: zhangyong
* @Date: 2020-07-03 11:09
*/
@ -20,30 +21,35 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/log")
@RestController
public class LogbackController {
private org.slf4j.Logger log = LoggerFactory.getLogger(LogbackController.class);
private org.slf4j.Logger log = LoggerFactory.getLogger(LogbackController.class);
/**
* logback动态修改包名的日志级别
* @param level 日志级别
* @param packageName 包名
* @return 当前的日志级别
* @throws Exception
*/
@GetMapping("/setlevel")
public String updateLogbackLevel( @RequestParam(value="level") String level,
@RequestParam(value="packageName",defaultValue = "-1") String packageName) throws Exception {
LoggerContext loggerContext =(LoggerContext) LoggerFactory.getILoggerFactory();
log.info("动态修改日志级别入参, 日志级别level:", level);
log.info("动态修改日志级别入参, 包名packageName:", packageName);
Logger logger= null;
if("-1".equals(packageName)) {
// 默认值-1,更改全局日志级别;否则按传递的包名或类名修改日志级别。
logger= loggerContext.getLogger("root");
} else {
logger= loggerContext.getLogger(packageName);
}
logger.setLevel(Level.toLevel(level));
log.info("动态修改日志级别, 修改后, 当前的日志级别", String.valueOf(logger.getLevel()));
return String.valueOf(logger.getLevel());
}
/**
* logback动态修改包名的日志级别 排查完问题记得改回原来的级别
*
* @param level 日志级别
* @param packageName 包名或类名
* @return 修改后的日志级别
*/
@GetMapping("/setlevel")
public String updateLogbackLevel(@RequestParam(value = "level") String level,
@RequestParam(value = "packageName", defaultValue = "-1") String packageName) {
try {
LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
log.info("动态修改日志级别入参, 日志级别level:{},包名packageName:{}", level, packageName);
Logger logger = null;
if ("-1".equals(packageName)) {
// 默认值-1,更改全局日志级别;否则按传递的包名或类名修改日志级别。
logger = loggerContext.getLogger("root");
} else {
logger = loggerContext.getLogger(packageName);
}
Level preLevel = logger.getLevel();
logger.setLevel(Level.toLevel(level));
log.info("动态修改日志级别由【{}】 修改为【{}】", preLevel, logger.getLevel());
return String.valueOf(logger.getLevel());
} catch (Exception e) {
log.error("动态修改日志级别失败", e);
}
return null;
}
}

7
epmet-module/data-statistical/data-statistical-server/pom.xml

@ -261,10 +261,9 @@
<thread.pool.max-pool-size>8</thread.pool.max-pool-size>
<thread.pool.queue-capacity>10</thread.pool.queue-capacity>
<thread.pool.keep-alive>30</thread.pool.keep-alive>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1</dingTalk.robot.secret>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
</properties>
</profile>
<profile>

6
epmet-module/epmet-job/epmet-job-server/pom.xml

@ -165,9 +165,9 @@
<nacos.ip/>
<spring.flyway.enabled>true</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1</dingTalk.robot.secret>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
</properties>
</profile>
<profile>

Loading…
Cancel
Save