From commits-return-59229-archive-asf-public=cust-asf.ponee.io@activemq.apache.org Wed Mar 4 20:43:37 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 8BA0818063F for ; Wed, 4 Mar 2020 21:43:37 +0100 (CET) Received: (qmail 91756 invoked by uid 500); 4 Mar 2020 20:43:37 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 91746 invoked by uid 99); 4 Mar 2020 20:43:36 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Mar 2020 20:43:36 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id BB3D58DACA; Wed, 4 Mar 2020 20:43:36 +0000 (UTC) Date: Wed, 04 Mar 2020 20:43:36 +0000 To: "commits@activemq.apache.org" Subject: [activemq] branch activemq-5.15.x updated: [AMQ-7346] Improve logging of the network connector MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <158335461666.624.11960030246563211499@gitbox.apache.org> From: jbonofre@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: activemq X-Git-Refname: refs/heads/activemq-5.15.x X-Git-Reftype: branch X-Git-Oldrev: 45ddc6630515971769eafa6c19778581aaa75f99 X-Git-Newrev: ae8df4945079108ae5c411216777eb54e8f02d27 X-Git-Rev: ae8df4945079108ae5c411216777eb54e8f02d27 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch activemq-5.15.x in repository https://gitbox.apache.org/repos/asf/activemq.git The following commit(s) were added to refs/heads/activemq-5.15.x by this push: new ae8df49 [AMQ-7346] Improve logging of the network connector ae8df49 is described below commit ae8df4945079108ae5c411216777eb54e8f02d27 Author: jbonofre AuthorDate: Wed Mar 4 17:54:37 2020 +0100 [AMQ-7346] Improve logging of the network connector (cherry picked from commit 3c4a644f3d6e5a21dee907928aa611902312df16) --- .../activemq/network/DemandForwardingBridgeSupport.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java index ca165c0..5ca2d34 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java +++ b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java @@ -222,7 +222,8 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br @Override public void onException(IOException error) { if (!futureLocalBrokerInfo.isDone()) { - LOG.info("error with pending local brokerInfo on: " + localBroker, error); + LOG.info("Error with pending local brokerInfo on: {} ({})", localBroker, error.getMessage()); + LOG.debug("Peer error: ", error); futureLocalBrokerInfo.cancel(true); return; } @@ -241,7 +242,8 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br @Override public void onException(IOException error) { if (!futureRemoteBrokerInfo.isDone()) { - LOG.info("error with pending remote brokerInfo on: " + remoteBroker, error); + LOG.info("Error with pending remote brokerInfo on: {} ({})", remoteBroker, error.getMessage()); + LOG.debug("Peer error: ", error); futureRemoteBrokerInfo.cancel(true); return; } @@ -642,13 +644,9 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br public void serviceRemoteException(Throwable error) { if (!disposed.get()) { if (error instanceof SecurityException || error instanceof GeneralSecurityException) { - LOG.error("Network connection between {} and {} shutdown due to a remote error: {}", new Object[]{ - localBroker, remoteBroker, error - }); + LOG.error("Network connection between {} and {} shutdown due to a remote error: {}", localBroker, remoteBroker, error.toString()); } else { - LOG.warn("Network connection between {} and {} shutdown due to a remote error: {}", new Object[]{ - localBroker, remoteBroker, error - }); + LOG.warn("Network connection between {} and {} shutdown due to a remote error: {}", localBroker, remoteBroker, error.toString()); } LOG.debug("The remote Exception was: {}", error, error); brokerService.getTaskRunnerFactory().execute(new Runnable() {