Polish contribution

Reduce visibility
Remove duplications

Signed-off-by: Violeta Georgieva <[email protected]>

Author: violetagg

docs/modules/ROOT/pages/http-server.adoc

@@ -504,31 +504,31 @@ The following example enables it programmatically:
 
 {examples-link}/errorLog/Application.java
 ----
-include::{examples-dir}/errorLog/Application.java[lines=21..32]
+include::{examples-dir}/errorLog/Application.java[lines=18..32]
 ----
 
 Calling this method takes precedence over the system property configuration.
 
-By default, the logging format is `[{datetime}] [error] [client {remote address}] {exception message}`, but you can
+By default, the logging format is `[+{datetime}+] [pid +{PID}+] [client {remote address}] {exception message}`, but you can
 specify a custom one as a parameter, as in the following example:
 
 {examples-link}/errorLog/CustomLogErrorFormatApplication.java
 ----
-include::{examples-dir}/errorLog/CustomLogErrorFormatApplication.java[lines=22..36]
+include::{examples-dir}/errorLog/CustomLogErrorFormatApplication.java[lines=18..33]
 ----
 
 You can also filter `HTTP` error logs by using the `ErrorLogFactory#createFilter` method, as in the following example:
 
 {examples-link}/errorLog/FilterLogErrorApplication.java
 ----
-include::{examples-dir}/errorLog/FilterLogErrorApplication.java[lines=22..36]
+include::{examples-dir}/errorLog/FilterLogErrorApplication.java[lines=18..33]
 ----
 
 Note that this method can take a custom format parameter too, as in this example:
 
 {examples-link}/errorLog/CustomFormatAndFilterErrorLogApplication.java.java
 ----
-include::{examples-dir}/errorLog/CustomFormatAndFilterErrorLogApplication.java[lines=23..40]
+include::{examples-dir}/errorLog/CustomFormatAndFilterErrorLogApplication.java[lines=18..35]
 ----
 <1> Specifies the filter predicate to use
 <2> Specifies the custom format to apply

reactor-netty-core/src/main/java/reactor/netty/NettyPipeline.java

@@ -89,11 +89,11 @@ public interface NettyPipeline {
 	String RIGHT                 = "reactor.right.";
 
 	String AccessLogHandler      = LEFT + "accessLogHandler";
-	String ErrorLogHandler       = LEFT + "errorLogHandler";
 	String ChannelMetricsHandler = LEFT + "channelMetricsHandler";
 	String ChunkedWriter         = LEFT + "chunkedWriter";
 	String CompressionHandler    = LEFT + "compressionHandler";
 	String ConnectMetricsHandler = LEFT + "connectMetricsHandler";
+	String ErrorLogHandler       = LEFT + "errorLogHandler";
 	String H2CUpgradeHandler     = LEFT + "h2cUpgradeHandler";
 	String H2Flush               = LEFT + "h2Flush";
 	String H2MultiplexHandler    = LEFT + "h2MultiplexHandler";

reactor-netty-examples/src/main/java/reactor/netty/examples/documentation/http/server/errorLog/Application.java

@@ -23,10 +23,10 @@ public class Application {
 	public static void main(String[] args) {
 		DisposableServer server =
 				HttpServer.create()
-						.errorLog(true)
-						.bindNow();
+				          .errorLog(true)
+				          .bindNow();
 
 		server.onDispose()
-				.block();
+		      .block();
 	}
-}
+}

reactor-netty-examples/src/main/java/reactor/netty/examples/documentation/http/server/errorLog/CustomFormatAndFilterErrorLogApplication.java

@@ -17,24 +17,19 @@
 
 import reactor.netty.DisposableServer;
 import reactor.netty.http.server.HttpServer;
-import reactor.netty.http.server.logging.error.DefaultErrorLog;
+import reactor.netty.http.server.logging.error.ErrorLog;
 import reactor.netty.http.server.logging.error.ErrorLogFactory;
 
 public class CustomFormatAndFilterErrorLogApplication {
 
 	public static void main(String[] args) {
 		DisposableServer server =
 				HttpServer.create()
-						.errorLog(
-								true,
-								ErrorLogFactory.createFilter(
-										p -> p.cause() instanceof RuntimeException, //<1>
-										x -> DefaultErrorLog.create("method={}, uri={}", x.httpServerInfos().method(), x.httpServerInfos().uri()) //<2>
-								)
-						)
-						.bindNow();
+				          .errorLog(true, ErrorLogFactory.createFilter(p -> p.cause() instanceof RuntimeException, //<1>
+				                  x -> ErrorLog.create("method={}, uri={}", x.httpServerInfos().method(), x.httpServerInfos().uri()))) //<2>
+				          .bindNow();
 
 		server.onDispose()
-				.block();
+		      .block();
 	}
-}
+}

reactor-netty-examples/src/main/java/reactor/netty/examples/documentation/http/server/errorLog/CustomLogErrorFormatApplication.java

@@ -17,20 +17,17 @@
 
 import reactor.netty.DisposableServer;
 import reactor.netty.http.server.HttpServer;
-import reactor.netty.http.server.logging.error.DefaultErrorLog;
+import reactor.netty.http.server.logging.error.ErrorLog;
 
 public class CustomLogErrorFormatApplication {
 
 	public static void main(String[] args) {
 		DisposableServer server =
 				HttpServer.create()
-						.errorLog(
-								true,
-								x -> DefaultErrorLog.create("method={}, uri={}", x.httpServerInfos().method(), x.httpServerInfos().uri())
-						)
-						.bindNow();
+				          .errorLog(true, x -> ErrorLog.create("method={}, uri={}", x.httpServerInfos().method(), x.httpServerInfos().uri()))
+				          .bindNow();
 
 		server.onDispose()
-				.block();
+		      .block();
 	}
-}
+}

reactor-netty-examples/src/main/java/reactor/netty/examples/documentation/http/server/errorLog/FilterLogErrorApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2025 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2025 VMware, Inc. or its affiliates, All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,13 +24,10 @@ public class FilterLogErrorApplication {
 	public static void main(String[] args) {
 		DisposableServer server =
 				HttpServer.create()
-						.errorLog(
-								true,
-								ErrorLogFactory.createFilter(p -> p.cause() instanceof RuntimeException)
-						)
-						.bindNow();
+				          .errorLog(true, ErrorLogFactory.createFilter(p -> p.cause() instanceof RuntimeException))
+				          .bindNow();
 
 		server.onDispose()
-				.block();
+		      .block();
 	}
-}
+}

reactor-netty-http/src/main/java/reactor/netty/http/server/Http3Codec.java

@@ -55,12 +55,12 @@ final class Http3Codec extends ChannelInitializer<QuicStreamChannel> {
 
 	final boolean                                                 accessLogEnabled;
 	final Function<AccessLogArgProvider, AccessLog>               accessLog;
-	final boolean                                                 errorLogEnabled;
-	final Function<ErrorLogArgProvider, ErrorLog>                 errorLog;
 	final HttpCompressionOptionsSpec                              compressionOptions;
 	final BiPredicate<HttpServerRequest, HttpServerResponse>      compressPredicate;
 	final ServerCookieDecoder                                     cookieDecoder;
 	final ServerCookieEncoder                                     cookieEncoder;
+	final boolean                                                 errorLogEnabled;
+	final Function<ErrorLogArgProvider, ErrorLog>                 errorLog;
 	final HttpServerFormDecoderProvider                           formDecoderProvider;
 	final BiFunction<ConnectionInfo, HttpRequest, ConnectionInfo> forwardedHeaderHandler;
 	final HttpMessageLogFactory                                   httpMessageLogFactory;
@@ -79,12 +79,12 @@ final class Http3Codec extends ChannelInitializer<QuicStreamChannel> {
 	Http3Codec(
 			boolean accessLogEnabled,
 			@Nullable Function<AccessLogArgProvider, AccessLog> accessLog,
-			boolean errorLogEnabled,
-			@Nullable Function<ErrorLogArgProvider, ErrorLog> errorLog,
 			@Nullable HttpCompressionOptionsSpec compressionOptions,
 			@Nullable BiPredicate<HttpServerRequest, HttpServerResponse> compressPredicate,
 			ServerCookieDecoder decoder,
 			ServerCookieEncoder encoder,
+			boolean errorLogEnabled,
+			@Nullable Function<ErrorLogArgProvider, ErrorLog> errorLog,
 			HttpServerFormDecoderProvider formDecoderProvider,
 			@Nullable BiFunction<ConnectionInfo, HttpRequest, ConnectionInfo> forwardedHeaderHandler,
 			HttpMessageLogFactory httpMessageLogFactory,
@@ -100,12 +100,12 @@ final class Http3Codec extends ChannelInitializer<QuicStreamChannel> {
 			boolean validate) {
 		this.accessLogEnabled = accessLogEnabled;
 		this.accessLog = accessLog;
-		this.errorLogEnabled = errorLogEnabled;
-		this.errorLog = errorLog;
 		this.compressionOptions = compressionOptions;
 		this.compressPredicate = compressPredicate;
 		this.cookieDecoder = decoder;
 		this.cookieEncoder = encoder;
+		this.errorLogEnabled = errorLogEnabled;
+		this.errorLog = errorLog;
 		this.formDecoderProvider = formDecoderProvider;
 		this.forwardedHeaderHandler = forwardedHeaderHandler;
 		this.httpMessageLogFactory = httpMessageLogFactory;
@@ -172,12 +172,12 @@ else if (metricsRecorder instanceof ContextAwareHttpServerMetricsRecorder) {
 	static ChannelHandler newHttp3ServerConnectionHandler(
 			boolean accessLogEnabled,
 			@Nullable Function<AccessLogArgProvider, AccessLog> accessLog,
-			boolean errorLogEnabled,
-			@Nullable Function<ErrorLogArgProvider, ErrorLog> errorLog,
 			@Nullable HttpCompressionOptionsSpec compressionOptions,
 			@Nullable BiPredicate<HttpServerRequest, HttpServerResponse> compressPredicate,
 			ServerCookieDecoder decoder,
 			ServerCookieEncoder encoder,
+			boolean errorLogEnabled,
+			@Nullable Function<ErrorLogArgProvider, ErrorLog> errorLog,
 			HttpServerFormDecoderProvider formDecoderProvider,
 			@Nullable BiFunction<ConnectionInfo, HttpRequest, ConnectionInfo> forwardedHeaderHandler,
 			HttpMessageLogFactory httpMessageLogFactory,
@@ -192,7 +192,7 @@ static ChannelHandler newHttp3ServerConnectionHandler(
 			@Nullable Function<String, String> uriTagValue,
 			boolean validate) {
 		return new Http3ServerConnectionHandler(
-				new Http3Codec(accessLogEnabled, accessLog, errorLogEnabled, errorLog, compressionOptions, compressPredicate, decoder, encoder,
+				new Http3Codec(accessLogEnabled, accessLog, compressionOptions, compressPredicate, decoder, encoder, errorLogEnabled, errorLog,
 						formDecoderProvider, forwardedHeaderHandler, httpMessageLogFactory, listener, mapHandle, methodTagValue, metricsRecorder,
 						minCompressionSize, opsFactory, readTimeout, requestTimeout, uriTagValue, validate));
 	}

reactor-netty-http/src/main/java/reactor/netty/http/server/HttpServer.java

@@ -52,7 +52,7 @@
 import reactor.netty.http.server.logging.AccessLogFactory;
 import reactor.netty.http.server.logging.error.ErrorLog;
 import reactor.netty.http.server.logging.error.ErrorLogArgProvider;
-import reactor.netty.http.server.logging.error.DefaultErrorLoggingEvent;
+import reactor.netty.http.server.logging.error.ErrorLogEvent;
 import reactor.netty.http.server.logging.error.ErrorLogFactory;
 import reactor.netty.internal.util.Metrics;
 import reactor.netty.tcp.SslProvider;
@@ -274,77 +274,6 @@ public final HttpServer accessLog(Function<AccessLogArgProvider, AccessLog> acce
 		return dup;
 	}
 
-	/**
-	 * Enable or disable the error log. If enabled, the default log system will be used.
-	 * <p>
-	 * Example:
-	 * <pre>
-	 * {@code
-	 * HttpServer.create()
-	 *           .port(8080)
-	 *           .route(r -> r.get("/hello",
-	 *                   (req, res) -> res.header(CONTENT_TYPE, TEXT_PLAIN)
-	 *                                    .sendString(Mono.just("Hello World!"))))
-	 *           .errorLog(true)
-	 *           .bindNow()
-	 *           .onDispose()
-	 *           .block();
-	 * }
-	 * </pre>
-	 * <p>
-	 *
-	 * Note that this method takes precedence over the {@value reactor.netty.ReactorNetty#ERROR_LOG_ENABLED} system property.
-	 * By default, error logs are formatted as "[{datetime}] [pid {pid}] [client {remote address}] {error message}".
-	 *
-	 * @param enable enable or disable the error log
-	 * @return a new {@link HttpServer}
-	 * @since 1.2.5
-	 */
-	public final HttpServer errorLog(boolean enable) {
-		HttpServer dup = duplicate();
-		dup.configuration().errorLog = null;
-		dup.configuration().errorLogEnabled = enable;
-		return dup;
-	}
-
-	/**
-	 * Enable or disable the error log and customize it through an {@link ErrorLogFactory}.
-	 * <p>
-	 * Example:
-	 * <pre>
-	 * {@code
-	 * HttpServer.create()
-	 *           .port(8080)
-	 *           .route(r -> r.get("/hello",
-	 *                   (req, res) -> res.header(CONTENT_TYPE, TEXT_PLAIN)
-	 *                                    .sendString(Mono.just("Hello World!"))))
-	 *           .errorLog(true, ErrorLogFactory.createFilter(
-	 *                              args -> args.cause() instanceof RuntimeException,
-	 *                              args -> ErrorLog.create("host-name={}", args.httpServerInfos().hostName())))
-	 *           .bindNow()
-	 *           .onDispose()
-	 *           .block();
-	 * }
-	 * </pre>
-	 * <p>
-	 * The {@link ErrorLogFactory} class offers several helper methods to generate such a function,
-	 * notably if one wants to {@link ErrorLogFactory#createFilter(Predicate) filter} some exceptions out of the error log.
-	 * <p>
-	 * Note that this method takes precedence over the {@value reactor.netty.ReactorNetty#ERROR_LOG_ENABLED} system property.
-	 *
-	 * @param enable enable or disable the error log
-	 * @param errorLogFactory the {@link ErrorLogFactory} that creates an {@link ErrorLog} given an {@link ErrorLogArgProvider}
-	 * @return a new {@link HttpServer}
-	 * @since 1.2.5
-	 */
-	public final HttpServer errorLog(boolean enable, ErrorLogFactory errorLogFactory) {
-		Objects.requireNonNull(errorLogFactory, "errorLogFactory");
-		HttpServer dup = duplicate();
-		dup.configuration().errorLog = enable ? errorLogFactory : null;
-		dup.configuration().errorLogEnabled = enable;
-		return dup;
-	}
-
 	@Override
 	public final HttpServer bindAddress(Supplier<? extends SocketAddress> bindAddressSupplier) {
 		return super.bindAddress(bindAddressSupplier);
@@ -490,6 +419,77 @@ public final HttpServer cookieCodec(ServerCookieEncoder encoder, ServerCookieDec
 		return dup;
 	}
 
+	/**
+	 * Enable or disable the error log. If enabled, the default log system will be used.
+	 * <p>
+	 * Example:
+	 * <pre>
+	 * {@code
+	 * HttpServer.create()
+	 *           .port(8080)
+	 *           .route(r -> r.get("/hello",
+	 *                   (req, res) -> res.header(CONTENT_TYPE, TEXT_PLAIN)
+	 *                                    .sendString(Mono.just("Hello World!"))))
+	 *           .errorLog(true)
+	 *           .bindNow()
+	 *           .onDispose()
+	 *           .block();
+	 * }
+	 * </pre>
+	 * <p>
+	 *
+	 * Note that this method takes precedence over the {@value reactor.netty.ReactorNetty#ERROR_LOG_ENABLED} system property.
+	 * By default, error logs are formatted as {@code [{datetime}] [pid {pid}] [client {remote address}] {error message}}.
+	 *
+	 * @param enable enable or disable the error log
+	 * @return a new {@link HttpServer}
+	 * @since 1.2.6
+	 */
+	public final HttpServer errorLog(boolean enable) {
+		HttpServer dup = duplicate();
+		dup.configuration().errorLog = null;
+		dup.configuration().errorLogEnabled = enable;
+		return dup;
+	}
+
+	/**
+	 * Enable or disable the error log and customize it through an {@link ErrorLogFactory}.
+	 * <p>
+	 * Example:
+	 * <pre>
+	 * {@code
+	 * HttpServer.create()
+	 *           .port(8080)
+	 *           .route(r -> r.get("/hello",
+	 *                   (req, res) -> res.header(CONTENT_TYPE, TEXT_PLAIN)
+	 *                                    .sendString(Mono.just("Hello World!"))))
+	 *           .errorLog(true, ErrorLogFactory.createFilter(
+	 *                   args -> args.cause() instanceof RuntimeException,
+	 *                   args -> ErrorLog.create("host-name={}", args.httpServerInfos().hostName())))
+	 *           .bindNow()
+	 *           .onDispose()
+	 *           .block();
+	 * }
+	 * </pre>
+	 * <p>
+	 * The {@link ErrorLogFactory} class offers several helper methods to generate such a function,
+	 * notably if one wants to {@link ErrorLogFactory#createFilter(Predicate) filter} some exceptions out of the error log.
+	 * <p>
+	 * Note that this method takes precedence over the {@value reactor.netty.ReactorNetty#ERROR_LOG_ENABLED} system property.
+	 *
+	 * @param enable enable or disable the error log
+	 * @param errorLogFactory the {@link ErrorLogFactory} that creates an {@link ErrorLog} given an {@link ErrorLogArgProvider}
+	 * @return a new {@link HttpServer}
+	 * @since 1.2.6
+	 */
+	public final HttpServer errorLog(boolean enable, ErrorLogFactory errorLogFactory) {
+		Objects.requireNonNull(errorLogFactory, "errorLogFactory");
+		HttpServer dup = duplicate();
+		dup.configuration().errorLog = enable ? errorLogFactory : null;
+		dup.configuration().errorLogEnabled = enable;
+		return dup;
+	}
+
 	/**
 	 * Specifies a custom request handler for deriving information about the connection.
 	 *
@@ -1325,8 +1325,7 @@ public void onStateChange(Connection connection, State newState) {
 				}
 				catch (Throwable t) {
 					log.error(format(connection.channel(), ""), t);
-					connection.channel().pipeline()
-							.fireUserEventTriggered(new DefaultErrorLoggingEvent(t));
+					connection.channel().pipeline().fireUserEventTriggered(ErrorLogEvent.create(t));
 					//"FutureReturnValueIgnored" this is deliberate
 					connection.channel()
 					          .close();