diff --git a/src/main/java/neatlogic/framework/logback/logback-base.xml b/src/main/java/neatlogic/framework/logback/logback-base.xml new file mode 100644 index 0000000000000000000000000000000000000000..da4b6a28c45d85512407c4d6f380cd4b8adc3547 --- /dev/null +++ b/src/main/java/neatlogic/framework/logback/logback-base.xml @@ -0,0 +1,414 @@ + + + + + + + + + ${log4j.home}/debug.log + + ${log4j.home}/debug.log.%i + 1 + 5 + + + DEBUG + NEUTRAL + DENY + + + + neatlogic.** + neatlogic.**.dao.mapper.** + + NEUTRAL + DENY + + + 100MB + + + [%-5level]%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36}[%line] [%tenant] %requestUrl - %msg%n + + + + + 0 + 50 + + true + + + + ${log4j.home}/info.log + + ${log4j.home}/info.log.%i + 1 + 5 + + + INFO + NEUTRAL + DENY + + + + neatlogic.** + neatlogic.**.dao.mapper.** + + NEUTRAL + DENY + + + 100MB + + + [%-5level]%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36}[%line] [%tenant] %requestUrl - %msg%n + + + + + 0 + 50 + + true + + + + ${log4j.home}/warn.log + + ${log4j.home}/warn.log.%i + 1 + 5 + + + WARN + NEUTRAL + DENY + + + 100MB + + + [%-5level]%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36}[%line] [%tenant] %requestUrl - %msg%n + + + + + 0 + 50 + + true + + + + ${log4j.home}/error.log + + ${log4j.home}/error.log.%i + 1 + 5 + + + ERROR + NEUTRAL + DENY + + + 100MB + + + [%-5level]%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36}[%line] [%tenant] %requestUrl - %msg%n %requestParam%n + + + + + + + 0 + 50 + + true + + + + + [%-5level]%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36}[%line] [%tenant] %requestUrl - %msg%n + + UTF-8 + false + + + + neatlogic.** + neatlogic.** + neatlogic.**.dao.mapper.** + neatlogic.** + neatlogic.**.dao.mapper.** + + NEUTRAL + DENY + + + + + + ${log4j.home}/tagentRegisterAndNetty.log + + ${log4j.home}/tagentRegisterAndNetty.%i + 1 + 5 + + + ERROR + ACCEPT + DENY + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + 100MB + + + [%-5level]%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36}[%line] [%tenant] %requestUrl - %msg%n + + + + + + + 0 + 50 + + true + + + + + ${log4j.home}/methodTimingAspect.log + + ${log4j.home}/methodTimingAspect.%i + 1 + 5 + + + ERROR + ACCEPT + DENY + + + 100MB + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %requestUrl - %msg%n + + + + + + + 0 + 50 + + true + + + + ${log4j.home}/notifyAudit.log + + ${log4j.home}/notifyAudit.log.%i + 1 + 5 + + + INFO + ACCEPT + DENY + + + 100MB + + + [%-5level]%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36}[%line] [%tenant] %requestUrl- %msg%n + + + + + + + 0 + 50 + + true + + + + ${log4j.home}/deadlock.log + + ${log4j.home}/deadlock.log.%i + 1 + 5 + + + ERROR + ACCEPT + DENY + + + 100MB + + + [%-5level]%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36}[%line] [%tenant] %requestUrl- %msg%n + + + + + + + 0 + 50 + + true + + + + ${log4j.home}/exceptionAudit.log + + ${log4j.home}/exceptionAudit.log.%i + 1 + 5 + + + ERROR + ACCEPT + DENY + + + 100MB + + + [%-5level]%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36}[%line] [%tenant] %requestUrl- %msg%n + + + + + + + 0 + 50 + + true + + + + ${log4j.home}/sqlTimeout.log + + ${log4j.home}/sqlTimeout.log.%i + 1 + 5 + + + ERROR + ACCEPT + DENY + + + 100MB + + + [%-5level]%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36}[%line] [%tenant] %requestUrl- %msg%n + + + + + + + 0 + 50 + + true + + + + ${log4j.home}/process.log + + ${LOG_HOME}/process.%i + 1 + 5 + + + DEBUG + ACCEPT + DENY + + + 100MB + + + [%-5level]%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36}[%line] [%tenant] %requestUrl- %msg%n + + + + + + 0 + 50 + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/neatlogic/module/framework/matrix/handler/ExternalDataSourceHandler.java b/src/main/java/neatlogic/module/framework/matrix/handler/ExternalDataSourceHandler.java index 08bd2f6df26fed64994d4136f8356a3f27b2ae3e..f6d75fba7a975ea6c7b1d8a797e34cac66fef64a 100644 --- a/src/main/java/neatlogic/module/framework/matrix/handler/ExternalDataSourceHandler.java +++ b/src/main/java/neatlogic/module/framework/matrix/handler/ExternalDataSourceHandler.java @@ -367,7 +367,7 @@ public class ExternalDataSourceHandler extends MatrixDataSourceHandlerBase { paramObj.put("filterList", filterList); IntegrationResultVo resultVo = handler.sendRequest(integrationVo, RequestFrom.MATRIX); if (StringUtils.isNotBlank(resultVo.getError())) { - logger.error(resultVo.getError()); + logger.error(integrationVo.getUrl() + ", " + resultVo.getError()); throw new MatrixExternalAccessException(integrationVo.getName()); } handler.validate(resultVo);