You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2015/01/29 10:57:26 UTC
svn commit: r1655570 - in /sling/trunk/bundles/extensions/discovery/impl/src:
main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java
test/java/org/apache/sling/discovery/impl/setup/OSGiMock.java
test/resources/log4j.properties
Author: stefanegli
Date: Thu Jan 29 09:57:26 2015
New Revision: 1655570
URL: http://svn.apache.org/r1655570
Log:
SLING-4359 et al: setting log level to DEBUG for testing - plus adding a log.debug to the HeartbeatHandler - to narrow down who sends heartbeats still in tests even though the instance is intended to be crashed
Modified:
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java
sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/OSGiMock.java
sling/trunk/bundles/extensions/discovery/impl/src/test/resources/log4j.properties
Modified: sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java?rev=1655570&r1=1655569&r2=1655570&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java Thu Jan 29 09:57:26 2015
@@ -193,8 +193,10 @@ public class HeartbeatHandler implements
}
try {
+ final long interval = config.getHeartbeatInterval();
+ logger.info("initialize: starting periodic heartbeat job for "+slingId+" with interval "+interval+" sec.");
scheduler.addPeriodicJob(NAME, this,
- null, config.getHeartbeatInterval(), false);
+ null, interval, false);
} catch (Exception e) {
logger.error("activate: Could not start heartbeat runner: " + e, e);
}
@@ -271,12 +273,18 @@ public class HeartbeatHandler implements
logger.debug("issueRemoteHeartbeats: not issuing remote heartbeat yet, startup not yet finished");
return;
}
+ if (logger.isDebugEnabled()) {
+ logger.debug("issueRemoteHeartbeats: pinging outgoing topology connectors (if there is any) for "+slingId);
+ }
connectorRegistry.pingOutgoingConnectors(forcePing);
forcePing = false;
}
/** Issue a cluster local heartbeat (into the repository) **/
private void issueClusterLocalHeartbeat() {
+ if (logger.isDebugEnabled()) {
+ logger.debug("issueClusterLocalHeartbeat: storing cluster-local heartbeat to repository for "+slingId);
+ }
ResourceResolver resourceResolver = null;
final String myClusterNodePath = getLocalClusterNodePath();
final Calendar currentTime = Calendar.getInstance();
Modified: sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/OSGiMock.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/OSGiMock.java?rev=1655570&r1=1655569&r2=1655570&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/OSGiMock.java (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/OSGiMock.java Thu Jan 29 09:57:26 2015
@@ -27,9 +27,13 @@ import java.util.List;
import javax.jcr.Session;
import org.apache.sling.commons.testing.jcr.RepositoryProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class OSGiMock {
+ private static final Logger logger = LoggerFactory.getLogger(OSGiMock.class);
+
private final List<Object> services = new LinkedList<Object>();
public void addService(Object service) {
@@ -66,9 +70,13 @@ public class OSGiMock {
if (method.getName().equals("activate")) {
method.setAccessible(true);
if ( method.getParameterTypes().length == 0 ) {
+ logger.info("activate: activating "+aService+"...");
method.invoke(aService, null);
+ logger.info("activate: activating "+aService+" done.");
} else {
+ logger.info("activate: activating "+aService+"...");
method.invoke(aService, MockFactory.mockComponentContext());
+ logger.info("activate: activating "+aService+" done.");
}
}
}
Modified: sling/trunk/bundles/extensions/discovery/impl/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/test/resources/log4j.properties?rev=1655570&r1=1655569&r2=1655570&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/test/resources/log4j.properties (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/test/resources/log4j.properties Thu Jan 29 09:57:26 2015
@@ -18,6 +18,7 @@
log4j.rootLogger=INFO, stdout
log4j.logger.org.apache.jackrabbit.core.TransientRepository=WARN
+log4j.logger.org.apache.sling.discovery.impl=DEBUG
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout