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/03 18:47:10 UTC
svn commit: r1528931 - in /karaf/cellar/branches/cellar-2.3.x:
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/command/
core/src/main/java/org/apa...
Author: jbonofre
Date: Thu Oct 3 16:47:09 2013
New Revision: 1528931
URL: http://svn.apache.org/r1528931
Log:
[KARAF-2498] Change log level to DEBUG for blocked resources
Modified:
karaf/cellar/branches/cellar-2.3.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java
karaf/cellar/branches/cellar-2.3.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java
karaf/cellar/branches/cellar-2.3.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java
karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java
karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java
karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java
karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java
karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java
karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java
karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/event/EventDispatchTask.java
karaf/cellar/branches/cellar-2.3.x/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/EndpointDescription.java
karaf/cellar/branches/cellar-2.3.x/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/RemoteServiceCallHandler.java
karaf/cellar/branches/cellar-2.3.x/event/src/main/java/org/apache/karaf/cellar/event/ClusterEventHandler.java
karaf/cellar/branches/cellar-2.3.x/event/src/main/java/org/apache/karaf/cellar/event/EventSupport.java
karaf/cellar/branches/cellar-2.3.x/event/src/main/java/org/apache/karaf/cellar/event/LocalEventListener.java
karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java
karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSupport.java
karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java
karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java
karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java
karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java
karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueProducer.java
karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java
karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicProducer.java
karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java
karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/merge/CellarMergePolicy.java
karaf/cellar/branches/cellar-2.3.x/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java
karaf/cellar/branches/cellar-2.3.x/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java
karaf/cellar/branches/cellar-2.3.x/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java
Modified: karaf/cellar/branches/cellar-2.3.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java Thu Oct 3 16:47:09 2013
@@ -48,13 +48,13 @@ public class BundleEventHandler extends
public void handle(ClusterBundleEvent event) {
// 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;
}
// check if the node is local
if (!groupManager.isLocalGroup(event.getSourceGroup().getName())) {
- LOGGER.info("CELLAR BUNDLE: node is not part of the event cluster group");
+ LOGGER.debug("CELLAR BUNDLE: node is not part of the event cluster group");
return;
}
@@ -65,7 +65,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 the feature {} marked as BLOCKED INBOUND in cluster group {}", event.getLocation(), feature.getName(), event.getSourceGroup().getName());
+ LOGGER.debug("CELLAR BUNDLE: bundle {} is contained in the feature {} marked as BLOCKED INBOUND in cluster group {}", event.getLocation(), feature.getName(), event.getSourceGroup().getName());
return;
}
}
Modified: karaf/cellar/branches/cellar-2.3.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java Thu Oct 3 16:47:09 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());
}
}
}
@@ -95,7 +95,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);
}
}
}
@@ -115,7 +115,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;
}
@@ -180,7 +180,7 @@ public class BundleSynchronizer extends
eventProducer.produce(event);
}
- } else LOGGER.warn("CELLAR BUNDLE: bundle {} is marked as BLOCKED OUTBOUND for cluster group {}", bundleLocation, groupName);
+ } else LOGGER.debug("CELLAR BUNDLE: bundle {} is marked as BLOCKED OUTBOUND for cluster group {}", bundleLocation, groupName);
}
} finally {
Thread.currentThread().setContextClassLoader(originalClassLoader);
@@ -208,7 +208,7 @@ public class BundleSynchronizer extends
result = Boolean.parseBoolean(propertyValue);
}
} catch (IOException e) {
- LOGGER.error("CELLAR BUNDLE: failed to check if sync is enabled", e);
+ LOGGER.warn("CELLAR BUNDLE: failed to check if sync is enabled", e);
}
return result;
}
Modified: karaf/cellar/branches/cellar-2.3.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java Thu Oct 3 16:47:09 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/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java Thu Oct 3 16:47:09 2013
@@ -45,7 +45,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;
}
@@ -90,7 +90,7 @@ public class ConfigurationEventHandler e
} catch (IOException ex) {
LOGGER.error("CELLAR CONFIG: failed to update local configuration", ex);
}
- } else LOGGER.warn("CELLAR CONFIG: configuration with PID {} is marked BLOCKED INBOUND for cluster group {}", pid, groupName);
+ } else LOGGER.debug("CELLAR CONFIG: configuration with PID {} is marked BLOCKED INBOUND for cluster group {}", pid, groupName);
}
public void init() {
Modified: karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java Thu Oct 3 16:47:09 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());
}
}
}
@@ -95,7 +95,7 @@ public class ConfigurationSynchronizer e
LOGGER.error("CELLAR CONFIG: failed to update local configuration", ex);
}
}
- LOGGER.warn("CELLAR CONFIG: configuration with PID {} is marked BLOCKED INBOUND for cluster group {}", clusterPID, groupName);
+ LOGGER.debug("CELLAR CONFIG: configuration with PID {} is marked BLOCKED INBOUND for cluster group {}", clusterPID, groupName);
}
} finally {
Thread.currentThread().setContextClassLoader(originalClassLoader);
@@ -112,7 +112,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;
}
@@ -138,7 +138,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 update configuration (IO error)", ex);
Modified: karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java Thu Oct 3 16:47:09 2013
@@ -49,7 +49,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;
}
@@ -103,7 +103,7 @@ public class LocalConfigurationListener
} catch (Exception e) {
LOGGER.error("CELLAR CONFIG: failed to update configuration with PID {} to 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/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java Thu Oct 3 16:47:09 2013
@@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit;
*/
public class Command<R extends Result> extends Event {
- protected static final Logger logger = LoggerFactory.getLogger(Command.class);
+ protected static final Logger LOGGER = LoggerFactory.getLogger(Command.class);
protected long timeout = 10000;
protected final BlockingQueue<Map<Node, R>> resultQueue = new LinkedBlockingQueue<Map<Node, R>>();
@@ -57,7 +57,7 @@ public class Command<R extends Result> e
try {
resultQueue.put(nodeResults);
} catch (InterruptedException e) {
- logger.error("Error adding result to result queue", e);
+ LOGGER.error("Error adding result to result queue", e);
}
}
@@ -76,7 +76,7 @@ public class Command<R extends Result> e
try {
resultQueue.put(nodeResults);
} catch (InterruptedException e) {
- logger.error("Error adding result to result queue", e);
+ LOGGER.error("Error adding result to result queue", e);
}
}
}
Modified: karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java Thu Oct 3 16:47:09 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/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java Thu Oct 3 16:47:09 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;
@@ -38,8 +37,6 @@ public class ManageHandlersCommandHandle
private final Switch commandSwitch = new BasicSwitch(SWITCH_ID);
- private Consumer consumer;
-
/**
* Execute the cluster manage handlers command event and get the result.
*
@@ -109,7 +106,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/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java Thu Oct 3 16:47:09 2013
@@ -14,10 +14,8 @@
package org.apache.karaf.cellar.core.discovery;
import java.io.IOException;
-import java.util.Collections;
import java.util.Dictionary;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
Modified: karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/event/EventDispatchTask.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/event/EventDispatchTask.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/event/EventDispatchTask.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/core/src/main/java/org/apache/karaf/cellar/core/event/EventDispatchTask.java Thu Oct 3 16:47:09 2013
@@ -49,26 +49,26 @@ public class EventDispatchTask<E extends
@Override
public void run() {
try {
- boolean dispatched = false;
+ boolean dispatched = false;
- for (long delay = 0; delay < timeout && !dispatched; delay += interval) {
- EventHandler handler = handlerRegistry.getHandler(event);
- if (handler != null) {
- handler.handle(event);
- dispatched = true;
- } else {
- try {
- Thread.sleep(interval);
- } catch (InterruptedException e) {
- LOGGER.warn("Interrupted while waiting for event handler", e);
+ for (long delay = 0; delay < timeout && !dispatched; delay += interval) {
+ EventHandler handler = handlerRegistry.getHandler(event);
+ if (handler != null) {
+ handler.handle(event);
+ dispatched = true;
+ } else {
+ try {
+ Thread.sleep(interval);
+ } catch (InterruptedException e) {
+ LOGGER.warn("Interrupted while waiting for event handler", e);
+ }
}
}
- }
- if (!dispatched) {
- LOGGER.warn("Failed to retrieve handler for event {}", event.getClass());
- }
- }catch(Exception ex) {
- LOGGER.error("Error while dispatching task",ex);
+ if (!dispatched) {
+ LOGGER.warn("Failed to retrieve handler for event {}", event.getClass());
+ }
+ } catch (Exception ex) {
+ LOGGER.error("Error while dispatching task", ex);
}
}
Modified: karaf/cellar/branches/cellar-2.3.x/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/EndpointDescription.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/EndpointDescription.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/EndpointDescription.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/EndpointDescription.java Thu Oct 3 16:47:09 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/branches/cellar-2.3.x/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/RemoteServiceCallHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/RemoteServiceCallHandler.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/RemoteServiceCallHandler.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/RemoteServiceCallHandler.java Thu Oct 3 16:47:09 2013
@@ -36,10 +36,10 @@ import java.lang.reflect.Method;
*/
public class RemoteServiceCallHandler extends CellarSupport implements EventHandler<RemoteServiceCall> {
- public static final String SWITCH_ID = "org.apache.karaf.cellar.dosgi.switch";
-
private static final transient Logger LOGGER = LoggerFactory.getLogger(RemoteServiceCallHandler.class);
+ public static final String SWITCH_ID = "org.apache.karaf.cellar.dosgi.switch";
+
private final Switch dosgiSwitch = new BasicSwitch(SWITCH_ID);
private BundleContext bundleContext;
@@ -51,7 +51,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/branches/cellar-2.3.x/event/src/main/java/org/apache/karaf/cellar/event/ClusterEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/event/src/main/java/org/apache/karaf/cellar/event/ClusterEventHandler.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/event/src/main/java/org/apache/karaf/cellar/event/ClusterEventHandler.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/event/src/main/java/org/apache/karaf/cellar/event/ClusterEventHandler.java Thu Oct 3 16:47:09 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;
}
@@ -58,7 +58,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 as BLOCKED INBOUND", event.getTopicName());
+ } else LOGGER.debug("CELLAR EVENT: event {} is marked as BLOCKED INBOUND", event.getTopicName());
} catch (Exception e) {
LOGGER.error("CELLAR EVENT: failed to handle event", e);
}
Modified: karaf/cellar/branches/cellar-2.3.x/event/src/main/java/org/apache/karaf/cellar/event/EventSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/event/src/main/java/org/apache/karaf/cellar/event/EventSupport.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/event/src/main/java/org/apache/karaf/cellar/event/EventSupport.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/event/src/main/java/org/apache/karaf/cellar/event/EventSupport.java Thu Oct 3 16:47:09 2013
@@ -79,7 +79,7 @@ public class EventSupport extends Cellar
*/
public void postEvent(String topicName, Map<String, Serializable> properties) {
if (topicName == null) {
- LOGGER.error("CELLAR EVENT: failed to post event");
+ LOGGER.warn("CELLAR EVENT: failed to post event");
return;
}
@@ -95,7 +95,7 @@ public class EventSupport extends Cellar
*/
public void sendEvent(String topicName, Map<String, Serializable> properties) {
if (topicName == null) {
- LOGGER.error("CELLAR EVENT: failed to send event");
+ LOGGER.warn("CELLAR EVENT: failed to send event");
return;
}
Modified: karaf/cellar/branches/cellar-2.3.x/event/src/main/java/org/apache/karaf/cellar/event/LocalEventListener.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/event/src/main/java/org/apache/karaf/cellar/event/LocalEventListener.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/event/src/main/java/org/apache/karaf/cellar/event/LocalEventListener.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/event/src/main/java/org/apache/karaf/cellar/event/LocalEventListener.java Thu Oct 3 16:47:09 2013
@@ -23,7 +23,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.Serializable;
-import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -42,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;
}
@@ -73,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", topicName);
}
}
}
Modified: karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java Thu Oct 3 16:47:09 2013
@@ -58,7 +58,7 @@ public class FeaturesEventHandler extend
// check if the handler switch is ON
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;
}
@@ -103,7 +103,7 @@ public class FeaturesEventHandler extend
} catch (Exception e) {
LOGGER.error("CELLAR FEATURES: failed to handle 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());
}
@Override
Modified: karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSupport.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSupport.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSupport.java Thu Oct 3 16:47:09 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/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java Thu Oct 3 16:47:09 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());
}
}
}
@@ -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/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java Thu Oct 3 16:47:09 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/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java Thu Oct 3 16:47:09 2013
@@ -54,7 +54,7 @@ public class RepositoryEventHandler exte
// check if the handler is ON
if (eventSwitch.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;
}
Modified: karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java Thu Oct 3 16:47:09 2013
@@ -339,7 +339,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);
Modified: karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java Thu Oct 3 16:47:09 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 if OFF, event is not consumed", SWITCH_ID);
+ LOGGER.debug("CELLAR HAZELCAST: {} switch if OFF, event is not consumed", SWITCH_ID);
}
}
}
Modified: karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueProducer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueProducer.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueProducer.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueProducer.java Thu Oct 3 16:47:09 2013
@@ -84,7 +84,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 event", SWITCH_ID);
+ LOGGER.debug("CELLAR HAZELCAST: {} switch is OFF, don't produce the event", SWITCH_ID);
}
}
}
Modified: karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java Thu Oct 3 16:47:09 2013
@@ -72,7 +72,7 @@ public class TopicConsumer<E extends Eve
dispatcher.dispatch(event);
} else {
if (eventSwitch.getStatus().equals(SwitchStatus.OFF)) {
- LOGGER.warn("CELLAR HAZELCAST: {} switch if OFF, event is not consumed", SWITCH_ID);
+ LOGGER.debug("CELLAR HAZELCAST: {} switch if OFF, event is not consumed", SWITCH_ID);
}
}
}
Modified: karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicProducer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicProducer.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicProducer.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicProducer.java Thu Oct 3 16:47:09 2013
@@ -66,7 +66,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 event", SWITCH_ID);
+ LOGGER.debug("CELLAR HAZELCAST: {} switch is OFF, don't produce the event", SWITCH_ID);
}
}
}
Modified: karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java Thu Oct 3 16:47:09 2013
@@ -59,7 +59,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("CELLAR HAZELCAST: Hazelcast discoveredMemberSet has been changed from {} to {}", discoveredMemberSet, newDiscoveredMemberSet);
+ LOGGER.debug("CELLAR HAZELCAST: Hazelcast discoveredMemberSet has been changed from {} to {}", discoveredMemberSet, newDiscoveredMemberSet);
discoveredMemberSet = newDiscoveredMemberSet;
updated = Boolean.TRUE;
}
Modified: karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/merge/CellarMergePolicy.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/merge/CellarMergePolicy.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/merge/CellarMergePolicy.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/merge/CellarMergePolicy.java Thu Oct 3 16:47:09 2013
@@ -43,7 +43,7 @@ public class CellarMergePolicy implemen
*/
@Override
public Object merge(String mapName, MapEntry mergingEntry, MapEntry existingEntry) {
- LOGGER.info("CELLAR HAZELCAST: merge policy triggered merging entry {}, existing entry {}",mergingEntry,existingEntry);
+ LOGGER.debug("CELLAR HAZELCAST: 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/branches/cellar-2.3.x/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java Thu Oct 3 16:47:09 2013
@@ -114,7 +114,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;
}
@@ -152,7 +152,7 @@ public class ObrBundleEventHandler exten
}
} else LOGGER.warn("CELLAR OBR: could not resolve targets");
}
- } else LOGGER.warn("CELLAR OBR: bundle {} is marked BLOCKED INBOUND for cluster group {}", bundleId, event.getSourceGroup().getName());
+ } else LOGGER.debug("CELLAR OBR: bundle {} is marked 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/branches/cellar-2.3.x/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java Thu Oct 3 16:47:09 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;
}
@@ -80,7 +80,7 @@ public class ObrUrlEventHandler extends
LOGGER.warn("CELLAR OBR: the repository URL hasn't been removed from the OBR service");
}
}
- } else LOGGER.warn("CELLAR OBR: repository URL {} is marked BLOCKED INBOUND for cluster group {}", url, groupName);
+ } else LOGGER.debug("CELLAR OBR: repository URL {} is marked BLOCKED INBOUND for cluster group {}", url, groupName);
} catch (Exception e) {
LOGGER.error("CELLAR OBR: failed to register URL {}", url, e);
}
Modified: karaf/cellar/branches/cellar-2.3.x/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java?rev=1528931&r1=1528930&r2=1528931&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java Thu Oct 3 16:47:09 2013
@@ -43,7 +43,7 @@ public class ObrUrlSynchronizer extends
if (isSyncEnabled(group)) {
pull(group);
push(group);
- } else LOGGER.warn("CELLAR OBR: sync is disabled for group {}", group.getName());
+ } else LOGGER.debug("CELLAR OBR: sync is disabled for group {}", group.getName());
}
}
}
@@ -109,7 +109,7 @@ public class ObrUrlSynchronizer extends
// TODO fire event to the other nodes ?
}
} else {
- LOGGER.warn("CELLAR OBR: URL " + repository.getURI().toString() + " is blocked outbound");
+ LOGGER.debug("CELLAR OBR: URL {} is BLOCKED OUTBOUND for cluster group {}", repository.getURI().toString(), groupName);
}
}
} finally {