[KARAF-2498] Change log level to DEBUG for blocked resources git-svn-id: https://svn.apache.org/repos/asf/karaf/cellar/trunk@1529137 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/ef5dec8d Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/ef5dec8d Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/ef5dec8d Branch: refs/heads/master Commit: ef5dec8d1aef77fd8accec2a63e794bed4e6214e Parents: fe98fae Author: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Authored: Fri Oct 4 12:18:21 2013 +0000 Committer: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Committed: Fri Oct 4 12:18:21 2013 +0000 ---------------------------------------------------------------------- .../org/apache/karaf/cellar/bundle/BundleEventHandler.java | 6 +++--- .../org/apache/karaf/cellar/bundle/BundleSynchronizer.java | 8 ++++---- .../org/apache/karaf/cellar/bundle/LocalBundleListener.java | 6 +++--- .../karaf/cellar/config/ConfigurationEventHandler.java | 4 ++-- .../karaf/cellar/config/ConfigurationSynchronizer.java | 8 ++++---- .../karaf/cellar/config/LocalConfigurationListener.java | 4 ++-- .../karaf/cellar/core/control/ManageGroupCommandHandler.java | 1 - .../cellar/core/control/ManageHandlersCommandHandler.java | 6 +----- .../org/apache/karaf/cellar/dosgi/EndpointDescription.java | 2 -- .../apache/karaf/cellar/dosgi/RemoteServiceCallHandler.java | 2 +- .../org/apache/karaf/cellar/event/ClusterEventHandler.java | 4 ++-- .../org/apache/karaf/cellar/event/LocalEventListener.java | 4 ++-- .../apache/karaf/cellar/features/FeaturesEventHandler.java | 4 ++-- .../org/apache/karaf/cellar/features/FeaturesSupport.java | 4 ++-- .../apache/karaf/cellar/features/FeaturesSynchronizer.java | 6 +++--- .../apache/karaf/cellar/features/LocalFeaturesListener.java | 6 +++--- .../apache/karaf/cellar/features/RepositoryEventHandler.java | 2 +- .../apache/karaf/cellar/hazelcast/HazelcastGroupManager.java | 4 ++-- .../org/apache/karaf/cellar/hazelcast/QueueConsumer.java | 2 +- .../org/apache/karaf/cellar/hazelcast/QueueProducer.java | 2 +- .../org/apache/karaf/cellar/hazelcast/TopicConsumer.java | 2 +- .../org/apache/karaf/cellar/hazelcast/TopicProducer.java | 2 +- .../hazelcast/factory/HazelcastConfigurationManager.java | 2 +- .../karaf/cellar/hazelcast/merge/CellarMergePolicy.java | 2 +- .../org/apache/karaf/cellar/obr/ObrBundleEventHandler.java | 4 ++-- .../java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java | 2 +- .../java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java | 2 +- 27 files changed, 47 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java ---------------------------------------------------------------------- diff --git a/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java b/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java index d555d56..757ca3e 100644 --- a/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java +++ b/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java @@ -49,7 +49,7 @@ public class BundleEventHandler extends BundleSupport implements EventHandler<Cl // check if the handler switch is ON if (this.getSwitch().getStatus().equals(SwitchStatus.OFF)) { - LOGGER.warn("CELLAR BUNDLE: {} switch is OFF, cluster event is not handled", SWITCH_ID); + LOGGER.debug("CELLAR BUNDLE: {} switch is OFF, cluster event is not handled", SWITCH_ID); return; } @@ -72,7 +72,7 @@ public class BundleEventHandler extends BundleSupport implements EventHandler<Cl List<Feature> matchingFeatures = retrieveFeature(event.getLocation()); for (Feature feature : matchingFeatures) { if (!isAllowed(event.getSourceGroup(), "features", feature.getName(), EventType.INBOUND)) { - LOGGER.warn("CELLAR BUNDLE: bundle {} is contained in feature {} marked BLOCKED INBOUND for cluster group {}", event.getLocation(), feature.getName(), event.getSourceGroup().getName()); + LOGGER.debug("CELLAR BUNDLE: bundle {} is contained in feature {} marked BLOCKED INBOUND for cluster group {}", event.getLocation(), feature.getName(), event.getSourceGroup().getName()); return; } } @@ -92,7 +92,7 @@ public class BundleEventHandler extends BundleSupport implements EventHandler<Cl updateBundle(event.getSymbolicName(), event.getVersion()); LOGGER.debug("CELLAR BUNDLE: updating {}/{}", event.getSymbolicName(), event.getVersion()); } - } else LOGGER.warn("CELLAR BUNDLE: bundle {} is marked BLOCKED INBOUND for cluster group {}", event.getSymbolicName(), event.getSourceGroup().getName()); + } else LOGGER.debug("CELLAR BUNDLE: bundle {} is marked BLOCKED INBOUND for cluster group {}", event.getSymbolicName(), event.getSourceGroup().getName()); } catch (BundleException e) { LOGGER.error("CELLAR BUNDLE: failed to install bundle {}/{}.", new Object[]{event.getSymbolicName(), event.getVersion()}, e); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java ---------------------------------------------------------------------- diff --git a/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java b/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java index 6194be9..b2ad279 100644 --- a/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java +++ b/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java @@ -50,7 +50,7 @@ public class BundleSynchronizer extends BundleSupport implements Synchronizer { if (isSyncEnabled(group)) { pull(group); push(group); - } else LOGGER.warn("CELLAR BUNDLE: sync is disabled for cluster group {}", group.getName()); + } else LOGGER.debug("CELLAR BUNDLE: sync is disabled for cluster group {}", group.getName()); } } } @@ -96,7 +96,7 @@ public class BundleSynchronizer extends BundleSupport implements Synchronizer { } catch (BundleException e) { LOGGER.error("CELLAR BUNDLE: failed to pull bundle {}", id, e); } - } else LOGGER.warn("CELLAR BUNDLE: bundle {} is marked BLOCKED INBOUND for cluster group {}", bundleLocation, groupName); + } else LOGGER.debug("CELLAR BUNDLE: bundle {} is marked BLOCKED INBOUND for cluster group {}", bundleLocation, groupName); } } } @@ -116,7 +116,7 @@ public class BundleSynchronizer extends BundleSupport implements Synchronizer { // check if the producer is ON if (eventProducer.getSwitch().getStatus().equals(SwitchStatus.OFF)) { - LOGGER.warn("CELLAR BUNDLE: cluster event producer is OFF"); + LOGGER.debug("CELLAR BUNDLE: cluster event producer is OFF"); return; } @@ -181,7 +181,7 @@ public class BundleSynchronizer extends BundleSupport implements Synchronizer { eventProducer.produce(event); } - } else LOGGER.warn("CELLAR BUNDLE: bundle {} is marked BLOCKED OUTBOUND for cluster group {}", bundleLocation, groupName); + } else LOGGER.debug("CELLAR BUNDLE: bundle {} is marked BLOCKED OUTBOUND for cluster group {}", bundleLocation, groupName); } } finally { Thread.currentThread().setContextClassLoader(originalClassLoader); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java ---------------------------------------------------------------------- diff --git a/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java b/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java index 71df359..359c7c2 100644 --- a/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java +++ b/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java @@ -58,7 +58,7 @@ public class LocalBundleListener extends BundleSupport implements SynchronousBun // check if the producer is ON if (eventProducer.getSwitch().getStatus().equals(SwitchStatus.OFF)) { - LOGGER.warn("CELLAR BUNDLE: cluster event producer is OFF"); + LOGGER.debug("CELLAR BUNDLE: cluster event producer is OFF"); return; } @@ -109,7 +109,7 @@ public class LocalBundleListener extends BundleSupport implements SynchronousBun List<Feature> matchingFeatures = retrieveFeature(bundleLocation); for (Feature feature : matchingFeatures) { if (!isAllowed(group, "features", feature.getName(), EventType.OUTBOUND)) { - LOGGER.warn("CELLAR BUNDLE: bundle {} is contained in feature {} marked BLOCKED OUTBOUND for cluster group {}", bundleLocation, feature.getName(), group.getName()); + LOGGER.debug("CELLAR BUNDLE: bundle {} is contained in feature {} marked BLOCKED OUTBOUND for cluster group {}", bundleLocation, feature.getName(), group.getName()); return; } } @@ -124,7 +124,7 @@ public class LocalBundleListener extends BundleSupport implements SynchronousBun Thread.currentThread().setContextClassLoader(originalClassLoader); } - } else LOGGER.warn("CELLAR BUNDLE: bundle {} is marked BLOCKED OUTBOUND for cluster group {}", bundleLocation, group.getName()); + } else LOGGER.debug("CELLAR BUNDLE: bundle {} is marked BLOCKED OUTBOUND for cluster group {}", bundleLocation, group.getName()); } } } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java ---------------------------------------------------------------------- diff --git a/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java b/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java index 1ebfde6..7cf7211 100644 --- a/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java +++ b/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java @@ -46,7 +46,7 @@ public class ConfigurationEventHandler extends ConfigurationSupport implements E // check if the handler is ON if (this.getSwitch().getStatus().equals(SwitchStatus.OFF)) { - LOGGER.warn("CELLAR CONFIG: {} switch is OFF, cluster event not handled", SWITCH_ID); + LOGGER.debug("CELLAR CONFIG: {} switch is OFF, cluster event not handled", SWITCH_ID); return; } @@ -96,7 +96,7 @@ public class ConfigurationEventHandler extends ConfigurationSupport implements E } catch (IOException ex) { LOGGER.error("CELLAR CONFIG: failed to read cluster configuration", ex); } - } else LOGGER.warn("CELLAR CONFIG: configuration PID {} is marked BLOCKED INBOUND for cluster group {}", pid, groupName); + } else LOGGER.debug("CELLAR CONFIG: configuration PID {} is marked BLOCKED INBOUND for cluster group {}", pid, groupName); } public void init() { http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java ---------------------------------------------------------------------- diff --git a/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java b/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java index a30b459..567daad 100644 --- a/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java +++ b/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java @@ -51,7 +51,7 @@ public class ConfigurationSynchronizer extends ConfigurationSupport implements S if (isSyncEnabled(group)) { pull(group); push(group); - } else LOGGER.warn("CELLAR CONFIG: sync is disabled for cluster group {}", group.getName()); + } else LOGGER.debug("CELLAR CONFIG: sync is disabled for cluster group {}", group.getName()); } } } @@ -94,7 +94,7 @@ public class ConfigurationSynchronizer extends ConfigurationSupport implements S } catch (IOException ex) { LOGGER.error("CELLAR CONFIG: failed to read local configuration", ex); } - } else LOGGER.warn("CELLAR CONFIG: configuration with PID {} is marked BLOCKED INBOUND for cluster group {}", clusterConfiguration, groupName); + } else LOGGER.debug("CELLAR CONFIG: configuration with PID {} is marked BLOCKED INBOUND for cluster group {}", clusterConfiguration, groupName); } } finally { Thread.currentThread().setContextClassLoader(originalClassLoader); @@ -111,7 +111,7 @@ public class ConfigurationSynchronizer extends ConfigurationSupport implements S // check if the producer is ON if (eventProducer.getSwitch().getStatus().equals(SwitchStatus.OFF)) { - LOGGER.warn("CELLAR CONFIG: cluster event producer is OFF"); + LOGGER.debug("CELLAR CONFIG: cluster event producer is OFF"); return; } @@ -139,7 +139,7 @@ public class ConfigurationSynchronizer extends ConfigurationSupport implements S event.setSourceGroup(group); eventProducer.produce(event); } else - LOGGER.warn("CELLAR CONFIG: configuration with PID {} is marked BLOCKED OUTBOUND for cluster group {}", pid, groupName); + LOGGER.debug("CELLAR CONFIG: configuration with PID {} is marked BLOCKED OUTBOUND for cluster group {}", pid, groupName); } } catch (IOException ex) { LOGGER.error("CELLAR CONFIG: failed to read configuration (IO error)", ex); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java ---------------------------------------------------------------------- diff --git a/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java b/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java index de4e105..f35d9fb 100644 --- a/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java +++ b/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java @@ -46,7 +46,7 @@ public class LocalConfigurationListener extends ConfigurationSupport implements // check if the producer is ON if (eventProducer.getSwitch().getStatus().equals(SwitchStatus.OFF)) { - LOGGER.warn("CELLAR CONFIG: cluster event producer is OFF"); + LOGGER.debug("CELLAR CONFIG: cluster event producer is OFF"); return; } @@ -100,7 +100,7 @@ public class LocalConfigurationListener extends ConfigurationSupport implements } catch (Exception e) { LOGGER.error("CELLAR CONFIG: failed to update configuration with PID {} in the cluster group {}", pid, group.getName(), e); } - } else LOGGER.warn("CELLAR CONFIG: configuration with PID {} is marked BLOCKED OUTBOUND for cluster group {}", pid, group.getName()); + } else LOGGER.debug("CELLAR CONFIG: configuration with PID {} is marked BLOCKED OUTBOUND for cluster group {}", pid, group.getName()); } } } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java b/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java index ab236dd..61bcace 100644 --- a/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java +++ b/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java @@ -36,7 +36,6 @@ public class ManageGroupCommandHandler extends CommandHandler<ManageGroupCommand ManageGroupAction action = command.getAction(); String targetGroupName = command.getGroupName(); - Node node = clusterManager.getNode(); if (ManageGroupAction.JOIN.equals(action)) { joinGroup(targetGroupName); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java b/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java index 601984e..d4ad1db 100644 --- a/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java +++ b/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java @@ -14,7 +14,6 @@ package org.apache.karaf.cellar.core.control; import org.apache.karaf.cellar.core.Configurations; -import org.apache.karaf.cellar.core.Consumer; import org.apache.karaf.cellar.core.command.CommandHandler; import org.apache.karaf.cellar.core.event.EventHandler; import org.osgi.framework.BundleContext; @@ -25,7 +24,6 @@ import org.osgi.service.cm.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.plaf.basic.BasicInternalFrameTitlePane; import java.util.Dictionary; /** @@ -39,8 +37,6 @@ public class ManageHandlersCommandHandler extends CommandHandler<ManageHandlersC private final Switch commandSwitch = new BasicSwitch(SWITCH_ID); - private Consumer consumer; - /** * Return a map containing all managed {@code EventHandler}s and their status. * @@ -109,7 +105,7 @@ public class ManageHandlersCommandHandler extends CommandHandler<ManageHandlersC } } } catch (Exception e) { - LOGGER.warn("Can't persist the handler " + handler + " status", e); + LOGGER.warn("Can't persist the handler {} status", handler, e); } } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/EndpointDescription.java ---------------------------------------------------------------------- diff --git a/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/EndpointDescription.java b/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/EndpointDescription.java index 83f6128..193b182 100644 --- a/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/EndpointDescription.java +++ b/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/EndpointDescription.java @@ -19,7 +19,6 @@ import org.osgi.framework.Filter; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.InvalidSyntaxException; -import java.io.Serializable; import java.util.Dictionary; import java.util.HashMap; import java.util.LinkedHashSet; @@ -32,7 +31,6 @@ import java.util.Set; */ public class EndpointDescription implements MultiNode { - //Id is {package}-{version}. private final String id; private final Set<Node> nodes = new LinkedHashSet<Node>(); private final Map<String, Object> properties = new HashMap<String, Object>(); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/RemoteServiceCallHandler.java ---------------------------------------------------------------------- diff --git a/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/RemoteServiceCallHandler.java b/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/RemoteServiceCallHandler.java index cfe8e27..67f8d04 100644 --- a/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/RemoteServiceCallHandler.java +++ b/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/RemoteServiceCallHandler.java @@ -56,7 +56,7 @@ public class RemoteServiceCallHandler extends CellarSupport implements EventHand // check if the handler switch is ON if (this.getSwitch().getStatus().equals(SwitchStatus.OFF)) { - LOGGER.warn("CELLAR DOSGI: {} switch is OFF, cluster event is not handled", SWITCH_ID); + LOGGER.debug("CELLAR DOSGI: {} switch is OFF, cluster event is not handled", SWITCH_ID); return; } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/event/src/main/java/org/apache/karaf/cellar/event/ClusterEventHandler.java ---------------------------------------------------------------------- diff --git a/event/src/main/java/org/apache/karaf/cellar/event/ClusterEventHandler.java b/event/src/main/java/org/apache/karaf/cellar/event/ClusterEventHandler.java index fee96ad..e0b9f12 100644 --- a/event/src/main/java/org/apache/karaf/cellar/event/ClusterEventHandler.java +++ b/event/src/main/java/org/apache/karaf/cellar/event/ClusterEventHandler.java @@ -41,7 +41,7 @@ public class ClusterEventHandler extends EventSupport implements EventHandler<Cl // check if the handler is ON if (this.getSwitch().getStatus().equals(SwitchStatus.OFF)) { - LOGGER.warn("CELLAR EVENT: {} is OFF, cluster event not handled", SWITCH_ID); + LOGGER.debug("CELLAR EVENT: {} is OFF, cluster event not handled", SWITCH_ID); return; } @@ -64,7 +64,7 @@ public class ClusterEventHandler extends EventSupport implements EventHandler<Cl properties.put(Constants.EVENT_SOURCE_GROUP_KEY, event.getSourceGroup()); properties.put(Constants.EVENT_SOURCE_NODE_KEY, event.getSourceNode()); postEvent(event.getTopicName(), properties); - } else LOGGER.warn("CELLAR EVENT: event {} is marked BLOCKED INBOUND for cluster group {}", event.getTopicName(), event.getSourceGroup().getName()); + } else LOGGER.debug("CELLAR EVENT: event {} is marked BLOCKED INBOUND for cluster group {}", event.getTopicName(), event.getSourceGroup().getName()); } catch (Exception e) { LOGGER.error("CELLAR EVENT: failed to handle event", e); } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/event/src/main/java/org/apache/karaf/cellar/event/LocalEventListener.java ---------------------------------------------------------------------- diff --git a/event/src/main/java/org/apache/karaf/cellar/event/LocalEventListener.java b/event/src/main/java/org/apache/karaf/cellar/event/LocalEventListener.java index f535ab3..71a9d9f 100644 --- a/event/src/main/java/org/apache/karaf/cellar/event/LocalEventListener.java +++ b/event/src/main/java/org/apache/karaf/cellar/event/LocalEventListener.java @@ -41,7 +41,7 @@ public class LocalEventListener extends EventSupport implements EventHandler { // check if the producer is ON if (eventProducer.getSwitch().getStatus().equals(SwitchStatus.OFF)) { - LOGGER.warn("CELLAR EVENT: cluster event producer is OFF"); + LOGGER.debug("CELLAR EVENT: cluster event producer is OFF"); return; } @@ -72,7 +72,7 @@ public class LocalEventListener extends EventSupport implements EventHandler { ClusterEvent clusterEvent = new ClusterEvent(topicName, properties); clusterEvent.setSourceGroup(group); eventProducer.produce(clusterEvent); - } else LOGGER.warn("CELLAR EVENT: event {} is marked as BLOCKED OUTBOUND", topicName); + } else LOGGER.debug("CELLAR EVENT: event {} is marked as BLOCKED OUTBOUND for cluster group {}", topicName, group.getName()); } } } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java ---------------------------------------------------------------------- diff --git a/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java b/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java index fc16741..b011402 100644 --- a/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java +++ b/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java @@ -56,7 +56,7 @@ public class FeaturesEventHandler extends FeaturesSupport implements EventHandle public void handle(ClusterFeaturesEvent event) { if (this.getSwitch().getStatus().equals(SwitchStatus.OFF)) { - LOGGER.warn("CELLAR FEATURES: {} switch is OFF, cluster event is not handled", SWITCH_ID); + LOGGER.debug("CELLAR FEATURES: {} switch is OFF, cluster event is not handled", SWITCH_ID); return; } @@ -107,7 +107,7 @@ public class FeaturesEventHandler extends FeaturesSupport implements EventHandle } catch (Exception e) { LOGGER.error("CELLAR FEATURES: failed to handle cluster feature event", e); } - } else LOGGER.warn("CELLAR FEATURES: feature {} is marked BLOCKED INBOUND for cluster group {}", name, event.getSourceGroup().getName()); + } else LOGGER.debug("CELLAR FEATURES: feature {} is marked BLOCKED INBOUND for cluster group {}", name, event.getSourceGroup().getName()); } /** http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSupport.java ---------------------------------------------------------------------- diff --git a/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSupport.java b/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSupport.java index 7d66b6a..f33b63a 100644 --- a/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSupport.java +++ b/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSupport.java @@ -98,7 +98,7 @@ public class FeaturesSupport extends CellarSupport { Boolean installed = featuresService.isInstalled(feature); clusterFeatures.put(info, installed); } - } else LOGGER.warn("CELLAR FEATURES: feature {} is marked BLOCKED OUTBOUND for cluster group {}", feature.getName(), groupName); + } else LOGGER.debug("CELLAR FEATURES: feature {} is marked BLOCKED OUTBOUND for cluster group {}", feature.getName(), groupName); } else LOGGER.warn("CELLAR FEATURES: feature is null"); } @@ -120,7 +120,7 @@ public class FeaturesSupport extends CellarSupport { FeatureInfo info = new FeatureInfo(feature.getName(), feature.getVersion()); clusterFeatures.put(info, force); } - } else LOGGER.warn("CELLAR FEATURES: feature {} is marked BLOCKED OUTBOUND for cluster group {}", feature.getName(), groupName); + } else LOGGER.debug("CELLAR FEATURES: feature {} is marked BLOCKED OUTBOUND for cluster group {}", feature.getName(), groupName); } else LOGGER.warn("CELLAR FEATURES: feature is null"); } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java ---------------------------------------------------------------------- diff --git a/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java b/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java index 6c3b919..3576f67 100644 --- a/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java +++ b/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java @@ -47,7 +47,7 @@ public class FeaturesSynchronizer extends FeaturesSupport implements Synchronize if (isSyncEnabled(group)) { pull(group); push(group); - } else LOGGER.warn("CELLAR FEATURES: sync is disabled for cluster group {}", group.getName()); + } else LOGGER.debug("CELLAR FEATURES: sync is disabled for cluster group {}", group.getName()); } } } @@ -123,7 +123,7 @@ public class FeaturesSynchronizer extends FeaturesSupport implements Synchronize LOGGER.error("CELLAR FEATURES: failed to uninstall feature {}/{} ", new Object[]{info.getName(), info.getVersion()}, e); } } - } else LOGGER.warn("CELLAR FEATURES: feature {} is marked BLOCKED INBOUND for cluster group {}", name, groupName); + } else LOGGER.debug("CELLAR FEATURES: feature {} is marked BLOCKED INBOUND for cluster group {}", name, groupName); } } } finally { @@ -141,7 +141,7 @@ public class FeaturesSynchronizer extends FeaturesSupport implements Synchronize public void push(Group group) { if (group != null) { String groupName = group.getName(); - LOGGER.info("CELLAR FEATURES: pushing features repositories and features in cluster group {}", groupName); + LOGGER.debug("CELLAR FEATURES: pushing features repositories and features in cluster group {}", groupName); clusterManager.getList(Constants.FEATURES + Configurations.SEPARATOR + groupName); ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader(); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java ---------------------------------------------------------------------- diff --git a/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java b/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java index 85bff69..f29b0e7 100644 --- a/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java +++ b/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java @@ -56,7 +56,7 @@ public class LocalFeaturesListener extends FeaturesSupport implements org.apache // check if the producer is ON if (eventProducer.getSwitch().getStatus().equals(SwitchStatus.OFF)) { - LOGGER.warn("CELLAR FEATURES: cluster event producer is OFF"); + LOGGER.debug("CELLAR FEATURES: cluster event producer is OFF"); return; } @@ -84,7 +84,7 @@ public class LocalFeaturesListener extends FeaturesSupport implements org.apache ClusterFeaturesEvent featureEvent = new ClusterFeaturesEvent(name, version, type); featureEvent.setSourceGroup(group); eventProducer.produce(featureEvent); - } else LOGGER.warn("CELLAR FEATURES: feature {} is marked BLOCKED OUTBOUND for cluster group {}", name, group.getName()); + } else LOGGER.debug("CELLAR FEATURES: feature {} is marked BLOCKED OUTBOUND for cluster group {}", name, group.getName()); } } } @@ -100,7 +100,7 @@ public class LocalFeaturesListener extends FeaturesSupport implements org.apache // check if the producer is ON if (eventProducer.getSwitch().getStatus().equals(SwitchStatus.OFF)) { - LOGGER.warn("CELLAR FEATURES: cluster event producer is OFF"); + LOGGER.debug("CELLAR FEATURES: cluster event producer is OFF"); return; } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java ---------------------------------------------------------------------- diff --git a/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java b/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java index 21d43c7..3799ec9 100644 --- a/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java +++ b/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java @@ -54,7 +54,7 @@ public class RepositoryEventHandler extends FeaturesSupport implements EventHand // check if the handler is ON if (eventSwitch.getStatus().equals(SwitchStatus.OFF)) { - LOGGER.error("CELLAR FEATURES: {} switch is OFF, cluster event is not handled", SWITCH_ID); + LOGGER.debug("CELLAR FEATURES: {} switch is OFF, cluster event is not handled", SWITCH_ID); return; } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java ---------------------------------------------------------------------- diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java index b781c6a..24156b9 100644 --- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java +++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java @@ -343,7 +343,7 @@ public class HazelcastGroupManager implements GroupManager, EntryListener, Confi String groupName = group.getName(); createGroup(groupName); - LOGGER.info("CELLAR HAZELCAST: registering cluster group {}.", groupName); + LOGGER.debug("CELLAR HAZELCAST: registering cluster group {}.", groupName); Properties serviceProperties = new Properties(); serviceProperties.put("type", "group"); serviceProperties.put("name", groupName); @@ -649,7 +649,7 @@ public class HazelcastGroupManager implements GroupManager, EntryListener, Confi */ @Override public void entryUpdated(EntryEvent entryEvent) { - LOGGER.info("CELLAR HAZELCAST: cluster group configuration has been updated, updating local configuration"); + LOGGER.debug("CELLAR HAZELCAST: cluster group configuration has been updated, updating local configuration"); try { Configuration conf = configurationAdmin.getConfiguration(GROUPS); Dictionary props = conf.getProperties(); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java ---------------------------------------------------------------------- diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java index da601ee..4734d89 100644 --- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java +++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java @@ -118,7 +118,7 @@ public class QueueConsumer<E extends Event> implements EventConsumer<E>, ItemLis dispatcher.dispatch(event); } else { if (eventSwitch.getStatus().equals(SwitchStatus.OFF)) { - LOGGER.warn("CELLAR HAZELCAST: {} switch is OFF, cluster event is not consumed", SWITCH_ID); + LOGGER.debug("CELLAR HAZELCAST: {} switch is OFF, cluster event is not consumed", SWITCH_ID); } } } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueProducer.java ---------------------------------------------------------------------- diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueProducer.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueProducer.java index d196f89..b8c9436 100644 --- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueProducer.java +++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueProducer.java @@ -79,7 +79,7 @@ public class QueueProducer<E extends Event> implements EventProducer<E> { } } else { if (eventSwitch.getStatus().equals(SwitchStatus.OFF)) { - LOGGER.warn("CELLAR HAZELCAST: {} switch is OFF, don't produce the cluster event", SWITCH_ID); + LOGGER.debug("CELLAR HAZELCAST: {} switch is OFF, don't produce the cluster event", SWITCH_ID); } } } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java ---------------------------------------------------------------------- diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java index ba9ef5e..a3c09e9 100644 --- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java +++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java @@ -67,7 +67,7 @@ public class TopicConsumer<E extends Event> implements EventConsumer<E>, Message dispatcher.dispatch(event); } else { if (eventSwitch.getStatus().equals(SwitchStatus.OFF)) { - LOGGER.warn("CELLAR HAZELCAST: {} switch is OFF, cluster event is not consumed", SWITCH_ID); + LOGGER.debug("CELLAR HAZELCAST: {} switch is OFF, cluster event is not consumed", SWITCH_ID); } } } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicProducer.java ---------------------------------------------------------------------- diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicProducer.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicProducer.java index f39d9c3..5978573 100644 --- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicProducer.java +++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicProducer.java @@ -61,7 +61,7 @@ public class TopicProducer<E extends Event> implements EventProducer<E> { topic.publish(event); } else { if (eventSwitch.getStatus().equals(SwitchStatus.OFF)) { - LOGGER.warn("CELLAR HAZELCAST: {} switch is OFF, don't produce the cluster event", SWITCH_ID); + LOGGER.debug("CELLAR HAZELCAST: {} switch is OFF, don't produce the cluster event", SWITCH_ID); } } } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java ---------------------------------------------------------------------- diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java index 1d7501b..a724962 100644 --- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java +++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java @@ -63,7 +63,7 @@ public class HazelcastConfigurationManager { if (properties.containsKey(Discovery.DISCOVERED_MEMBERS_PROPERTY_NAME)) { Set<String> newDiscoveredMemberSet = CellarUtils.createSetFromString((String) properties.get(Discovery.DISCOVERED_MEMBERS_PROPERTY_NAME)); if (!CellarUtils.collectionEquals(discoveredMemberSet, newDiscoveredMemberSet)) { - LOGGER.info("Hazelcast discoveredMemberSet has been changed from {} to {}", discoveredMemberSet, newDiscoveredMemberSet); + LOGGER.debug("Hazelcast discoveredMemberSet has been changed from {} to {}", discoveredMemberSet, newDiscoveredMemberSet); discoveredMemberSet = newDiscoveredMemberSet; updated = Boolean.TRUE; } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/merge/CellarMergePolicy.java ---------------------------------------------------------------------- diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/merge/CellarMergePolicy.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/merge/CellarMergePolicy.java index 4e40b60..6af9043 100644 --- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/merge/CellarMergePolicy.java +++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/merge/CellarMergePolicy.java @@ -43,7 +43,7 @@ public class CellarMergePolicy implements MergePolicy { */ @Override public Object merge(String mapName, MapEntry mergingEntry, MapEntry existingEntry) { - LOGGER.info("Cellar merge policy triggered merging entry {}, existing entry {}",mergingEntry,existingEntry); + LOGGER.debug("Cellar merge policy triggered merging entry {}, existing entry {}",mergingEntry,existingEntry); Object mergingDataValue = mergingEntry != null ? mergingEntry.getValue() : null; Object existingDataValue = existingEntry != null ? existingEntry.getValue() : null; http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java ---------------------------------------------------------------------- diff --git a/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java b/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java index ddba579..3e06b31 100644 --- a/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java +++ b/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java @@ -115,7 +115,7 @@ public class ObrBundleEventHandler extends ObrSupport implements EventHandler<Cl // check if the handler is ON if (this.getSwitch().getStatus().equals(SwitchStatus.OFF)) { - LOGGER.warn("CELLAR OBR: {} switch is OFF", SWITCH_ID); + LOGGER.debug("CELLAR OBR: {} switch is OFF", SWITCH_ID); return; } @@ -159,7 +159,7 @@ public class ObrBundleEventHandler extends ObrSupport implements EventHandler<Cl } } else LOGGER.warn("CELLAR OBR: could not resolve targets"); } - } else LOGGER.warn("CELLAR OBR: bundle {} is marked as BLOCKED INBOUND", bundleId); + } else LOGGER.debug("CELLAR OBR: bundle {} is marked as BLOCKED INBOUND for cluster group {}", bundleId, event.getSourceGroup().getName()); } catch (Exception e) { LOGGER.error("CELLAR OBR: failed to handle bundle event {}", bundleId, e); } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java ---------------------------------------------------------------------- diff --git a/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java b/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java index 2fb1d62..78b1e6e 100644 --- a/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java +++ b/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java @@ -54,7 +54,7 @@ public class ObrUrlEventHandler extends ObrSupport implements EventHandler<Clust // check if the handler is ON if (this.getSwitch().getStatus().equals(SwitchStatus.OFF)) { - LOGGER.warn("CELLAR OBR: switch is OFF", SWITCH_ID); + LOGGER.debug("CELLAR OBR: {} switch is OFF", SWITCH_ID); return; } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ef5dec8d/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java ---------------------------------------------------------------------- diff --git a/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java b/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java index 048d63e..a846814 100644 --- a/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java +++ b/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java @@ -113,7 +113,7 @@ public class ObrUrlSynchronizer extends ObrSupport implements Synchronizer { // TODO fire event to the other nodes ? } } else { - LOGGER.warn("CELLAR OBR: URL {} is blocked outbound for cluster group {}", repository.getURI().toString(), groupName); + LOGGER.debug("CELLAR OBR: URL {} is marked BLOCKED OUTBOUND for cluster group {}", repository.getURI().toString(), groupName); } } } finally {