wulin/qiuguo-iot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改日志保存日期

Browse Source
This commit is contained in:
wulin 2023-11-28 10:07:06 +08:00
parent 1bd78fc291
commit ecbc9045a7
4 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogMdcConfiguration.java
View File

@ -81,15 +81,10 @@ public class LogMdcConfiguration {
if(ctx.hasKey(Log4Constans.PRINT_LOG_ID)){ if(ctx.hasKey(Log4Constans.PRINT_LOG_ID)){
MDC.put(Log4Constans.PRINT_LOG_ID, ctx.get(Log4Constans.PRINT_LOG_ID)); MDC.put(Log4Constans.PRINT_LOG_ID, ctx.get(Log4Constans.PRINT_LOG_ID));
//String requestId = WebFluxSkyWalkingTraceContext.traceId();
//Tracer.createLocalSpan(Log4Constans.PRINT_LOG_ID);
// return;
} }
WebFluxSkyWalkingOperators.continueTracing(ctx, () ->{ WebFluxSkyWalkingOperators.continueTracing(ctx, () ->{
coreSubscriber.onNext(t); coreSubscriber.onNext(t);
}); });
//coreSubscriber.onNext(t);
} }

73
iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogWebFilter.java
View File

@ -42,11 +42,11 @@ import java.nio.charset.StandardCharsets;
public class LogWebFilter implements WebFilter { public class LogWebFilter implements WebFilter {
@Override @Override
public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) { public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
//Tracer.stopSpan();
//Tracer.createEntrySpan(Log4Constans.PRINT_LOG_ID, null);
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
ServerHttpRequest request = exchange.getRequest(); ServerHttpRequest request = exchange.getRequest();
String requestId = WebFluxSkyWalkingTraceContext.traceId(exchange); String requestId = WebFluxSkyWalkingTraceContext.segmentId(exchange);
log.info("获取到的traceId:{}", requestId); log.info("获取到的traceId:{}", requestId);
//String pid = WebFluxSkyWalkingTraceContext.getCorrelation(exchange, Log4Constans.PRINT_LOG_ID).get(); //String pid = WebFluxSkyWalkingTraceContext.getCorrelation(exchange, Log4Constans.PRINT_LOG_ID).get();
//log.info("获取到的pid:{}", pid); //log.info("获取到的pid:{}", pid);
@ -87,41 +87,52 @@ public class LogWebFilter implements WebFilter {
return contextTmp; return contextTmp;
}).doFinally(signalType -> { }).doFinally(signalType -> {
long endTime = System.currentTimeMillis(); WebFluxSkyWalkingOperators.continueTracing(newEx, () -> {
MDC.put(Log4Constans.PRINT_LOG_ID, tracId); long endTime = System.currentTimeMillis();
log.info("api end time:{}, total time:{}", endTime, endTime - startTime); MDC.put(Log4Constans.PRINT_LOG_ID, tracId);
//Tracer.stopSpan(); log.info("api end time:{}, total time:{}", endTime, endTime - startTime);
MDC.remove(Log4Constans.PRINT_LOG_ID); MDC.remove(Log4Constans.PRINT_LOG_ID);
}).contextWrite(ctx -> { });
Context contextTmp = ctx.put(Log4Constans.PRINT_LOG_ID, tracId);
return contextTmp;
}); });
} }
private ServerHttpRequest getRequest(ServerWebExchange exchange){ private ServerHttpRequest getRequest(ServerWebExchange exchange){
ServerHttpRequest request = exchange.getRequest(); ServerHttpRequest request = exchange.getRequest();
return new ServerHttpRequestDecorator(request){ return WebFluxSkyWalkingOperators.continueTracing(exchange, () -> {
@Override return new ServerHttpRequestDecorator(request) {
public Flux<DataBuffer> getBody() { @Override
Flux<DataBuffer> body = this.getDelegate().getBody(); public Flux<DataBuffer> getBody() {
return body.map(dataBuffer -> { Flux<DataBuffer> body = this.getDelegate().getBody();
if(!request.getMethod().equals(HttpMethod.GET) && !request.getMethod().equals(HttpMethod.DELETE)) { return body.map(dataBuffer -> {
log.info("request:{}", dataBuffer.toString(StandardCharsets.UTF_8)); if (/*!request.getMethod().equals(HttpMethod.GET) && */!request.getMethod().equals(HttpMethod.DELETE)) {
} log.info("request:{}", dataBuffer.toString(StandardCharsets.UTF_8));
return dataBuffer; }
}); return dataBuffer;
} });
}
/*
@Override
public HttpHeaders getHeaders() {
HttpHeaders httpHeaders = new HttpHeaders();
httpHeaders.putAll(super.getHeaders());
//httpHeaders.set("sw8", "customerIp");//sklwaking传过来的
//httpHeaders.set(Log4Constans.HEADER_TRACE_ID, tracId);
log.info("获取头信息");
return httpHeaders;
}
@Override
public String getMethodValue() {
log.info("获取方法");
return super.getMethodValue();
};
*/
};
});
/*@Override
public HttpHeaders getHeaders(){
HttpHeaders httpHeaders = new HttpHeaders();
httpHeaders.putAll(super.getHeaders());
httpHeaders.set("sw8", "customerIp");//sklwaking传过来的
//httpHeaders.set(Log4Constans.HEADER_TRACE_ID, tracId);
return httpHeaders;
}*/
};
} }

2
iot-modules/iot-box-websocket-api/src/main/resources/logback-dev.xml
View File

@ -41,7 +41,7 @@
<!-- 循环政策：基于时间创建日志文件 --> <!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 --> <!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/wran.%d{yyyy-MM-dd}.log</fileNamePattern> <fileNamePattern>${log.path}/warn.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 --> <!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory> <maxHistory>60</maxHistory>
</rollingPolicy> </rollingPolicy>

2
iot-modules/iot-box-websocket-api/src/main/resources/logback-prod.xml
View File

@ -41,7 +41,7 @@
<!-- 循环政策：基于时间创建日志文件 --> <!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 --> <!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/wran.%d{yyyy-MM-dd}.log</fileNamePattern> <fileNamePattern>${log.path}/warn.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 --> <!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory> <maxHistory>60</maxHistory>
</rollingPolicy> </rollingPolicy>