Add real ip in access log

making · making · commit e6cce7e5ab59 · 2022-01-25T02:35:59.000+09:00
diff --git a/tsunagu-client/src/main/java/am/ik/tsunagu/TsunaguConnector.java b/tsunagu-client/src/main/java/am/ik/tsunagu/TsunaguConnector.java
@@ -197,7 +197,8 @@ Function<ClientResponse, Flux<Payload>> handleResponse(HttpRequestMetadata httpR
 						.concatWith(response.bodyToFlux(ByteBuf.class) // then send response body
 								.doFinally(__ -> {
 									if (log.isInfoEnabled()) {
-										log.info("{}\t{} {} {}", httpRequestMetadata.getMethod(), httpResponseMetadata.getStatus().value(), httpRequestMetadata.getUri(), httpRequestMetadata.getHeaders().getFirst(HttpHeaders.USER_AGENT));
+										final HttpHeaders httpHeaders = httpRequestMetadata.getHeaders();
+										log.info("{}\t{}\t{} {} {}", httpHeaders.getFirst("X-Real-IP"), httpRequestMetadata.getMethod(), httpResponseMetadata.getStatus().value(), httpRequestMetadata.getUri(), httpHeaders.getFirst(HttpHeaders.USER_AGENT));
 									}
 								})
 								.map(DefaultPayload::create)
diff --git a/tsunagu-server/src/main/java/am/ik/tsunagu/TsunaguController.java b/tsunagu-server/src/main/java/am/ik/tsunagu/TsunaguController.java
@@ -120,7 +120,8 @@ BiFunction<Signal<? extends DataBuffer>, Flux<DataBuffer>, Publisher<? extends V
 					return response.writeWith(body)
 							.doFinally(__ -> {
 								if (log.isInfoEnabled()) {
-									log.info("{}\t{} {} {}", httpRequestMetadata.getMethod(), httpResponseMetadata.getStatus().value(), httpRequestMetadata.getUri(), httpRequestMetadata.getHeaders().getFirst(HttpHeaders.USER_AGENT));
+									final HttpHeaders httpHeaders = httpRequestMetadata.getHeaders();
+									log.info("{}\t{}\t{} {} {}", httpHeaders.getFirst("X-Real-IP"), httpRequestMetadata.getMethod(), httpResponseMetadata.getStatus().value(), httpRequestMetadata.getUri(), httpHeaders.getFirst(HttpHeaders.USER_AGENT));
 								}
 							});
 				}
@@ -170,7 +171,7 @@ public WebSocketHandler apply(ServerHttpRequest request) {
 					.data(session.receive()
 							.doFirst(() -> {
 								if (log.isInfoEnabled()) {
-									log.info("{}\t101 {} {}", httpRequestMetadata.getMethod(), httpRequestMetadata.getUri(), httpRequestMetadata.getHeaders().getFirst(HttpHeaders.USER_AGENT));
+									log.info("{}\t{}\t101 {} {}", httpHeaders.getFirst("X-Real-IP"), httpRequestMetadata.getMethod(), httpRequestMetadata.getUri(), httpHeaders.getFirst(HttpHeaders.USER_AGENT));
 								}
 							})
 							.map(message -> DataBufferUtils.retain(message.getPayload())), DataBuffer.class)

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,8 @@ BiFunction<Signal<? extends DataBuffer>, Flux<DataBuffer>, Publisher<? extends V`
`120`	`120`	`return response.writeWith(body)`
`121`	`121`	`.doFinally(__ -> {`
`122`	`122`	`if (log.isInfoEnabled()) {`
`123`		`- log.info("{}\t{} {} {}", httpRequestMetadata.getMethod(), httpResponseMetadata.getStatus().value(), httpRequestMetadata.getUri(), httpRequestMetadata.getHeaders().getFirst(HttpHeaders.USER_AGENT));`
	`123`	`+ final HttpHeaders httpHeaders = httpRequestMetadata.getHeaders();`
	`124`	`+ log.info("{}\t{}\t{} {} {}", httpHeaders.getFirst("X-Real-IP"), httpRequestMetadata.getMethod(), httpResponseMetadata.getStatus().value(), httpRequestMetadata.getUri(), httpHeaders.getFirst(HttpHeaders.USER_AGENT));`
`124`	`125`	`}`
`125`	`126`	`});`
`126`	`127`	`}`
`@@ -170,7 +171,7 @@ public WebSocketHandler apply(ServerHttpRequest request) {`
`170`	`171`	`.data(session.receive()`
`171`	`172`	`.doFirst(() -> {`
`172`	`173`	`if (log.isInfoEnabled()) {`
`173`		`- log.info("{}\t101 {} {}", httpRequestMetadata.getMethod(), httpRequestMetadata.getUri(), httpRequestMetadata.getHeaders().getFirst(HttpHeaders.USER_AGENT));`
	`174`	`+ log.info("{}\t{}\t101 {} {}", httpHeaders.getFirst("X-Real-IP"), httpRequestMetadata.getMethod(), httpRequestMetadata.getUri(), httpHeaders.getFirst(HttpHeaders.USER_AGENT));`
`174`	`175`	`}`
`175`	`176`	`})`
`176`	`177`	`.map(message -> DataBufferUtils.retain(message.getPayload())), DataBuffer.class)`