Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0BAD6200D06 for ; Tue, 8 Aug 2017 16:43:24 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0A6B41674BA; Tue, 8 Aug 2017 14:43:24 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4C87A1674BD for ; Tue, 8 Aug 2017 16:43:23 +0200 (CEST) Received: (qmail 87592 invoked by uid 500); 8 Aug 2017 14:43:22 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 87443 invoked by uid 99); 8 Aug 2017 14:43:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Aug 2017 14:43:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8C862F69A6; Tue, 8 Aug 2017 14:43:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: nferraro@apache.org To: commits@camel.apache.org Date: Tue, 08 Aug 2017 14:43:32 -0000 Message-Id: In-Reply-To: <13ca286ab7c84f2ca391930bd2b49d2c@git.apache.org> References: <13ca286ab7c84f2ca391930bd2b49d2c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/14] camel git commit: CAMEL-11331: Added better logging and upgrade library archived-at: Tue, 08 Aug 2017 14:43:24 -0000 CAMEL-11331: Added better logging and upgrade library Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b0739238 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b0739238 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b0739238 Branch: refs/heads/master Commit: b073923867c77f62b63d5c7337327c0720fe6105 Parents: b72cf4d Author: Nicola Ferraro Authored: Tue Aug 1 10:30:26 2017 +0200 Committer: Nicola Ferraro Committed: Tue Aug 8 16:39:43 2017 +0200 ---------------------------------------------------------------------- components/camel-kubernetes/pom.xml | 6 ++-- .../kubernetes/ha/lock/TimedLeaderNotifier.java | 36 ++++++++++++-------- 2 files changed, 24 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b0739238/components/camel-kubernetes/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/pom.xml b/components/camel-kubernetes/pom.xml index 38fa037..0d7b72b 100644 --- a/components/camel-kubernetes/pom.xml +++ b/components/camel-kubernetes/pom.xml @@ -44,14 +44,12 @@ io.fabric8 kubernetes-client - 2.3-SNAPSHOT - + ${kubernetes-client-version} io.fabric8 openshift-client - 2.3-SNAPSHOT - + ${kubernetes-client-version} http://git-wip-us.apache.org/repos/asf/camel/blob/b0739238/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/TimedLeaderNotifier.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/TimedLeaderNotifier.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/TimedLeaderNotifier.java index 6c51226..c95b517 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/TimedLeaderNotifier.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/TimedLeaderNotifier.java @@ -155,25 +155,33 @@ public class TimedLeaderNotifier implements Service { final Optional newLeader = leader; if (!newLeader.equals(lastCommunicatedLeader)) { lastCommunicatedLeader = newLeader; - LOG.debug("Communicating new leader: {}" + newLeader); - handler.onKubernetesClusterEvent(new KubernetesClusterEvent.KubernetesClusterLeaderChangedEvent() { - @Override - public Optional getData() { - return newLeader; - } - }); + LOG.info("The cluster has a new leader: {}", newLeader); + try { + handler.onKubernetesClusterEvent(new KubernetesClusterEvent.KubernetesClusterLeaderChangedEvent() { + @Override + public Optional getData() { + return newLeader; + } + }); + } catch (Throwable t) { + LOG.warn("Error while communicating the new leader to the handler", t); + } } final Set newMembers = members; if (!newMembers.equals(lastCommunicatedMembers)) { lastCommunicatedMembers = newMembers; - LOG.debug("Communicating new cluster members: {}" + newMembers); - handler.onKubernetesClusterEvent(new KubernetesClusterEvent.KubernetesClusterMemberListChangedEvent() { - @Override - public Set getData() { - return newMembers; - } - }); + LOG.info("The list of cluster members has changed: {}", newMembers); + try { + handler.onKubernetesClusterEvent(new KubernetesClusterEvent.KubernetesClusterMemberListChangedEvent() { + @Override + public Set getData() { + return newMembers; + } + }); + } catch (Throwable t) { + LOG.warn("Error while communicating the cluster members to the handler", t); + } } }