You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/10/04 14:18:22 UTC
svn commit: r1529137 - in /karaf/cellar/trunk:
bundle/src/main/java/org/apache/karaf/cellar/bundle/
config/src/main/java/org/apache/karaf/cellar/config/
core/src/main/java/org/apache/karaf/cellar/core/control/
dosgi/src/main/java/org/apache/karaf/cella...
Author: jbonofre
Date: Fri Oct 4 12:18:21 2013
New Revision: 1529137
URL: http://svn.apache.org/r1529137
Log:
[KARAF-2498] Change log level to DEBUG for blocked resources
Modified:
karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java
karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java
karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java
karaf/cellar/trunk/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/EndpointDescription.java
karaf/cellar/trunk/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/RemoteServiceCallHandler.java
karaf/cellar/trunk/event/src/main/java/org/apache/karaf/cellar/event/ClusterEventHandler.java
karaf/cellar/trunk/event/src/main/java/org/apache/karaf/cellar/event/LocalEventListener.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSupport.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueProducer.java
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicProducer.java
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/merge/CellarMergePolicy.java
karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java
karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java
karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java
Modified: karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java (original)
+++ karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java Fri Oct 4 12:18:21 2013
@@ -49,7 +49,7 @@ public class BundleEventHandler extends
// 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
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
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) {
Modified: karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java (original)
+++ karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java Fri Oct 4 12:18:21 2013
@@ -50,7 +50,7 @@ public class BundleSynchronizer extends
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
} 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
// 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
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);
Modified: karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java (original)
+++ karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java Fri Oct 4 12:18:21 2013
@@ -58,7 +58,7 @@ public class LocalBundleListener extends
// 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
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
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());
}
}
}
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java Fri Oct 4 12:18:21 2013
@@ -46,7 +46,7 @@ public class ConfigurationEventHandler 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 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() {
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java Fri Oct 4 12:18:21 2013
@@ -51,7 +51,7 @@ public class ConfigurationSynchronizer e
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 e
} 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 e
// 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 e
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);
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java Fri Oct 4 12:18:21 2013
@@ -46,7 +46,7 @@ public class LocalConfigurationListener
// 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
} 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());
}
}
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java Fri Oct 4 12:18:21 2013
@@ -36,7 +36,6 @@ public class ManageGroupCommandHandler e
ManageGroupAction action = command.getAction();
String targetGroupName = command.getGroupName();
- Node node = clusterManager.getNode();
if (ManageGroupAction.JOIN.equals(action)) {
joinGroup(targetGroupName);
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java Fri Oct 4 12:18:21 2013
@@ -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 ManageHandlersCommandHandle
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 ManageHandlersCommandHandle
}
}
} catch (Exception e) {
- LOGGER.warn("Can't persist the handler " + handler + " status", e);
+ LOGGER.warn("Can't persist the handler {} status", handler, e);
}
}
Modified: karaf/cellar/trunk/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/EndpointDescription.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/EndpointDescription.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/EndpointDescription.java (original)
+++ karaf/cellar/trunk/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/EndpointDescription.java Fri Oct 4 12:18:21 2013
@@ -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>();
Modified: karaf/cellar/trunk/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/RemoteServiceCallHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/RemoteServiceCallHandler.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/RemoteServiceCallHandler.java (original)
+++ karaf/cellar/trunk/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/RemoteServiceCallHandler.java Fri Oct 4 12:18:21 2013
@@ -56,7 +56,7 @@ public class RemoteServiceCallHandler ex
// 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;
}
Modified: karaf/cellar/trunk/event/src/main/java/org/apache/karaf/cellar/event/ClusterEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/event/src/main/java/org/apache/karaf/cellar/event/ClusterEventHandler.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/event/src/main/java/org/apache/karaf/cellar/event/ClusterEventHandler.java (original)
+++ karaf/cellar/trunk/event/src/main/java/org/apache/karaf/cellar/event/ClusterEventHandler.java Fri Oct 4 12:18:21 2013
@@ -41,7 +41,7 @@ public class ClusterEventHandler extends
// 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
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);
}
Modified: karaf/cellar/trunk/event/src/main/java/org/apache/karaf/cellar/event/LocalEventListener.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/event/src/main/java/org/apache/karaf/cellar/event/LocalEventListener.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/event/src/main/java/org/apache/karaf/cellar/event/LocalEventListener.java (original)
+++ karaf/cellar/trunk/event/src/main/java/org/apache/karaf/cellar/event/LocalEventListener.java Fri Oct 4 12:18:21 2013
@@ -41,7 +41,7 @@ public class LocalEventListener extends
// 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
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());
}
}
}
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java Fri Oct 4 12:18:21 2013
@@ -56,7 +56,7 @@ public class FeaturesEventHandler extend
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 extend
} 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());
}
/**
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSupport.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSupport.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSupport.java Fri Oct 4 12:18:21 2013
@@ -98,7 +98,7 @@ public class FeaturesSupport extends Cel
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 Cel
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");
}
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java Fri Oct 4 12:18:21 2013
@@ -47,7 +47,7 @@ public class FeaturesSynchronizer extend
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 extend
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 extend
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();
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java Fri Oct 4 12:18:21 2013
@@ -56,7 +56,7 @@ public class LocalFeaturesListener exten
// 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 exten
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 exten
// 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;
}
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java Fri Oct 4 12:18:21 2013
@@ -54,7 +54,7 @@ public class RepositoryEventHandler exte
// 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;
}
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java Fri Oct 4 12:18:21 2013
@@ -343,7 +343,7 @@ public class HazelcastGroupManager imple
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 imple
*/
@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();
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java Fri Oct 4 12:18:21 2013
@@ -118,7 +118,7 @@ public class QueueConsumer<E extends Eve
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);
}
}
}
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueProducer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueProducer.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueProducer.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueProducer.java Fri Oct 4 12:18:21 2013
@@ -79,7 +79,7 @@ public class QueueProducer<E extends Eve
}
} 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);
}
}
}
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java Fri Oct 4 12:18:21 2013
@@ -67,7 +67,7 @@ public class TopicConsumer<E extends Eve
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);
}
}
}
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicProducer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicProducer.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicProducer.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicProducer.java Fri Oct 4 12:18:21 2013
@@ -61,7 +61,7 @@ public class TopicProducer<E extends Eve
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);
}
}
}
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java Fri Oct 4 12:18:21 2013
@@ -63,7 +63,7 @@ public class HazelcastConfigurationManag
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;
}
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/merge/CellarMergePolicy.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/merge/CellarMergePolicy.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/merge/CellarMergePolicy.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/merge/CellarMergePolicy.java Fri Oct 4 12:18:21 2013
@@ -43,7 +43,7 @@ public class CellarMergePolicy implemen
*/
@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;
Modified: karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java (original)
+++ karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java Fri Oct 4 12:18:21 2013
@@ -115,7 +115,7 @@ public class ObrBundleEventHandler exten
// 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 exten
}
} 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);
}
Modified: karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java (original)
+++ karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java Fri Oct 4 12:18:21 2013
@@ -54,7 +54,7 @@ public class ObrUrlEventHandler extends
// 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;
}
Modified: karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java?rev=1529137&r1=1529136&r2=1529137&view=diff
==============================================================================
--- karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java (original)
+++ karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java Fri Oct 4 12:18:21 2013
@@ -113,7 +113,7 @@ public class ObrUrlSynchronizer extends
// 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 {