On Thu, 2019-06-27 at 14:38 -0400, Gary Gregory wrote:
> On Thu, Jun 27, 2019 at 2:22 PM <[email protected]> wrote:
>
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > olegk pushed a commit to branch improved-logging
> > in repository
> > https://gitbox.apache.org/repos/asf/httpcomponents-client.git
> >
> > commit a0aa438be8f42d3401455f8bfc4716cb534b6e45
> > Author: Oleg Kalnichevski <[email protected]>
> > AuthorDate: Sat Jun 15 12:28:35 2019 +0200
> >
> > Logging of multihome connect operations
> > ---
> > .../impl/async/InternalHttp2AsyncExecRuntime.java | 4 +--
> > .../impl/async/InternalHttpAsyncExecRuntime.java | 4 +--
> > .../http/impl/classic/InternalExecRuntime.java | 4 +--
> > .../http/impl/nio/MultihomeIOSessionRequester.java | 37
> > ++++++++++++++++++++++
> > 4 files changed, 43 insertions(+), 6 deletions(-)
> >
> > diff --git
> > a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/I
> > nternalHttp2AsyncExecRuntime.java
> > b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/I
> > nternalHttp2AsyncExecRuntime.java
> > index 2c17c9f..5fc835c 100644
> > ---
> > a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/I
> > nternalHttp2AsyncExecRuntime.java
> > +++
> > b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/I
> > nternalHttp2AsyncExecRuntime.java
> > @@ -89,7 +89,7 @@ class InternalHttp2AsyncExecRuntime implements
> > AsyncExecRuntime {
> > final RequestConfig requestConfig =
> > context.getRequestConfig();
> > final Timeout connectTimeout =
> > requestConfig.getConnectTimeout();
> > if (log.isDebugEnabled()) {
> > - log.debug(id + ": aquiring endpoint (" +
> > connectTimeout +
> > ")");
> > + log.debug(id + ": acquiring endpoint (" +
> > connectTimeout
> > + ")");
> >
>
> How about stating which endpoint?
>
---
log.debug(id + ": acquiring endpoint
---
There is an endpoint id in the log statement.
Oleg
> Gary
>
> }
> > return Operations.cancellable(connPool.getSession(
> > target,
> > @@ -101,7 +101,7 @@ class InternalHttp2AsyncExecRuntime implements
> > AsyncExecRuntime {
> > sessionRef.set(new Endpoint(target,
> > ioSession));
> > reusable = true;
> > if (log.isDebugEnabled()) {
> > - log.debug(id + ": aquired
> > endpoint");
> > + log.debug(id + ": acquired
> > endpoint");
> > }
> >
> > callback.completed(InternalHttp2AsyncExecRuntime.this);
> > }
> > diff --git
> > a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/I
> > nternalHttpAsyncExecRuntime.java
> > b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/I
> > nternalHttpAsyncExecRuntime.java
> > index 03a7db2..c6cb2a4 100644
> > ---
> > a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/I
> > nternalHttpAsyncExecRuntime.java
> > +++
> > b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/I
> > nternalHttpAsyncExecRuntime.java
> > @@ -95,7 +95,7 @@ class InternalHttpAsyncExecRuntime implements
> > AsyncExecRuntime {
> > final RequestConfig requestConfig =
> > context.getRequestConfig();
> > final Timeout connectionRequestTimeout =
> > requestConfig.getConnectionRequestTimeout();
> > if (log.isDebugEnabled()) {
> > - log.debug(id + ": aquiring endpoint (" +
> > connectionRequestTimeout + ")");
> > + log.debug(id + ": acquiring endpoint (" +
> > connectionRequestTimeout + ")");
> > }
> > return Operations.cancellable(manager.lease(
> > id,
> > @@ -109,7 +109,7 @@ class InternalHttpAsyncExecRuntime implements
> > AsyncExecRuntime {
> > endpointRef.set(connectionEndpoint);
> > reusable =
> > connectionEndpoint.isConnected();
> > if (log.isDebugEnabled()) {
> > - log.debug(id + ": aquired endpoint
> > " +
> > ConnPoolSupport.getId(connectionEndpoint));
> > + log.debug(id + ": acquired
> > endpoint " +
> > ConnPoolSupport.getId(connectionEndpoint));
> > }
> >
> > callback.completed(InternalHttpAsyncExecRuntime.this);
> > }
> > diff --git
> > a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic
> > /InternalExecRuntime.java
> > b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic
> > /InternalExecRuntime.java
> > index 63d67b1..49a9b15 100644
> > ---
> > a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic
> > /InternalExecRuntime.java
> > +++
> > b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic
> > /InternalExecRuntime.java
> > @@ -98,7 +98,7 @@ class InternalExecRuntime implements ExecRuntime,
> > Cancellable {
> > final RequestConfig requestConfig =
> > context.getRequestConfig();
> > final Timeout connectionRequestTimeout =
> > requestConfig.getConnectionRequestTimeout();
> > if (log.isDebugEnabled()) {
> > - log.debug(id + ": aquiring endpoint (" +
> > connectionRequestTimeout + ")");
> > + log.debug(id + ": acquiring endpoint (" +
> > connectionRequestTimeout + ")");
> > }
> > final LeaseRequest connRequest = manager.lease(id,
> > route,
> > connectionRequestTimeout, object);
> > state = object;
> > @@ -117,7 +117,7 @@ class InternalExecRuntime implements
> > ExecRuntime,
> > Cancellable {
> > cancellableDependency.setDependency(this);
> > }
> > if (log.isDebugEnabled()) {
> > - log.debug(id + ": aquired endpoint " +
> > ConnPoolSupport.getId(connectionEndpoint));
> > + log.debug(id + ": acquired endpoint " +
> > ConnPoolSupport.getId(connectionEndpoint));
> > }
> > } catch(final TimeoutException ex) {
> > throw new
> > ConnectionRequestTimeoutException(ex.getMessage());
> > diff --git
> > a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/Mul
> > tihomeIOSessionRequester.java
> > b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/Mul
> > tihomeIOSessionRequester.java
> > index ab0a7ba..9eb5186 100644
> > ---
> > a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/Mul
> > tihomeIOSessionRequester.java
> > +++
> > b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/Mul
> > tihomeIOSessionRequester.java
> > @@ -32,6 +32,7 @@ import java.net.InetAddress;
> > import java.net.InetSocketAddress;
> > import java.net.SocketAddress;
> > import java.net.UnknownHostException;
> > +import java.util.Arrays;
> > import java.util.concurrent.Future;
> > import java.util.concurrent.atomic.AtomicInteger;
> >
> > @@ -44,9 +45,12 @@ import org.apache.hc.core5.net.NamedEndpoint;
> > import org.apache.hc.core5.reactor.ConnectionInitiator;
> > import org.apache.hc.core5.reactor.IOSession;
> > import org.apache.hc.core5.util.Timeout;
> > +import org.slf4j.Logger;
> > +import org.slf4j.LoggerFactory;
> >
> > final class MultihomeIOSessionRequester {
> >
> > + private final Logger log =
> > LoggerFactory.getLogger(getClass());
> > private final DnsResolver dnsResolver;
> >
> > MultihomeIOSessionRequester(final DnsResolver dnsResolver) {
> > @@ -61,9 +65,18 @@ final class MultihomeIOSessionRequester {
> > final Timeout connectTimeout,
> > final Object attachment,
> > final FutureCallback<IOSession> callback) {
> > +
> > if (remoteAddress != null) {
> > + if (log.isDebugEnabled()) {
> > + log.debug(remoteEndpoint + ": connecting " +
> > localAddress
> > + " to " + remoteAddress + " (" + connectTimeout + ")");
> > + }
> > return connectionInitiator.connect(remoteEndpoint,
> > remoteAddress, localAddress, connectTimeout, attachment, callback);
> > }
> > +
> > + if (log.isDebugEnabled()) {
> > + log.debug(remoteEndpoint + ": resolving remote
> > address");
> > + }
> > +
> > final ComplexFuture<IOSession> future = new
> > ComplexFuture<>(callback);
> > final InetAddress[] remoteAddresses;
> > try {
> > @@ -72,6 +85,11 @@ final class MultihomeIOSessionRequester {
> > future.failed(ex);
> > return future;
> > }
> > +
> > + if (log.isDebugEnabled()) {
> > + log.debug(remoteEndpoint + ": resolved to " +
> > Arrays.asList(remoteAddresses));
> > + }
> > +
> > final Runnable runnable = new Runnable() {
> >
> > private final AtomicInteger attempt = new
> > AtomicInteger(0);
> > @@ -79,6 +97,11 @@ final class MultihomeIOSessionRequester {
> > void executeNext() {
> > final int index = attempt.getAndIncrement();
> > final InetSocketAddress remoteAddress = new
> > InetSocketAddress(remoteAddresses[index],
> > remoteEndpoint.getPort());
> > +
> > + if (log.isDebugEnabled()) {
> > + log.debug(remoteEndpoint + ": connecting " +
> > localAddress + " to " + remoteAddress + " (" + connectTimeout +
> > ")");
> > + }
> > +
> > final Future<IOSession> sessionFuture =
> > connectionInitiator.connect(
> > remoteEndpoint,
> > remoteAddress,
> > @@ -89,18 +112,32 @@ final class MultihomeIOSessionRequester {
> >
> > @Override
> > public void completed(final IOSession
> > session) {
> > + if (log.isDebugEnabled()) {
> > + if (log.isDebugEnabled()) {
> > + log.debug(remoteEndpoint +
> > ":
> > connected " + session.getId() + " " +
> > + session.getLocalAd
> > dress()
> > + "->" + session.getRemoteAddress());
> > + }
> > + }
> > future.completed(session);
> > }
> >
> > @Override
> > public void failed(final Exception
> > cause) {
> > if (attempt.get() >=
> > remoteAddresses.length) {
> > + if (log.isDebugEnabled()) {
> > + log.debug(remoteEndpoint +
> > ":
> > connection to " + remoteAddress + " failed " +
> > + "(" +
> > cause.getClass() +
> > "); terminating operation");
> > + }
> > if (cause instanceof
> > IOException) {
> > future.failed(new
> > HttpHostConnectException((IOException) cause, remoteEndpoint,
> > remoteAddresses));
> > } else {
> > future.failed(cause);
> > }
> > } else {
> > + if (log.isDebugEnabled()) {
> > + log.debug(remoteEndpoint +
> > ":
> > connection to " + remoteAddress + " failed " +
> > + "(" +
> > cause.getClass() +
> > "); retrying connection to the next address");
> > + }
> > executeNext();
> > }
> > }
> >
> >
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
