You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by mp...@apache.org on 2015/09/29 14:54:55 UTC
svn commit: r1705852 - in
/sling/trunk/contrib/extensions/distribution/core/src:
main/java/org/apache/sling/distribution/agent/impl/
main/java/org/apache/sling/distribution/packaging/
main/java/org/apache/sling/distribution/packaging/impl/exporter/ mai...
Author: mpetria
Date: Tue Sep 29 12:54:54 2015
New Revision: 1705852
URL: http://svn.apache.org/viewvc?rev=1705852&view=rev
Log:
SLING-5073: some minor changes for improved logging
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageInfo.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterTest.java
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java?rev=1705852&r1=1705851&r2=1705852&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgent.java Tue Sep 29 12:54:54 2015
@@ -229,7 +229,6 @@ public class SimpleDistributionAgent imp
private Collection<SimpleDistributionResponse> scheduleImportPackage(DistributionPackage distributionPackage) {
Collection<SimpleDistributionResponse> distributionResponses = new LinkedList<SimpleDistributionResponse>();
- log.debug("scheduling distribution of package {} {}", distributionPackage.getId(), distributionPackage);
// dispatch the distribution package to the queue distribution handler
try {
@@ -247,6 +246,9 @@ public class SimpleDistributionAgent imp
distributionPackage.close();
}
+ log.info("scheduled package {} with info {}", distributionPackage.getId(), distributionPackage.getInfo());
+
+
return distributionResponses;
}
@@ -337,6 +339,8 @@ public class SimpleDistributionAgent imp
}
try {
+ log.info("enabling trigger {}", trigger);
+
trigger.register(agentBasedRequestHandler);
} catch (DistributionTriggerException e) {
log.error("could not register handler from trigger {} {}", trigger, e);
@@ -350,6 +354,8 @@ public class SimpleDistributionAgent imp
}
try {
+ log.info("disabling trigger {}", trigger);
+
trigger.unregister(agentBasedRequestHandler);
} catch (DistributionTriggerException e) {
log.error("could not unregister handler from trigger {} {}", trigger, e);
@@ -398,6 +404,8 @@ public class SimpleDistributionAgent imp
success = reEnqueuePackage(distributionPackage);
DistributionPackageUtils.releaseOrDelete(distributionPackage, queueName);
}
+
+ log.info("processed package {} with info {} from queue {}", distributionPackage.getId(), distributionPackage.getInfo(), queueName);
} else {
success = true; // return success if package does not exist in order to clear the queue.
log.error("distribution package with id {} does not exist. the package will be skipped.", queueItem.getId());
@@ -422,7 +430,7 @@ public class SimpleDistributionAgent imp
return false;
}
- log.info("distribution package {} was delivered", distributionPackage.getId());
+ log.debug("distribution package {} was delivered", distributionPackage.getId());
return true;
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageInfo.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageInfo.java?rev=1705852&r1=1705851&r2=1705852&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageInfo.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/DistributionPackageInfo.java Tue Sep 29 12:54:54 2015
@@ -138,9 +138,9 @@ public final class DistributionPackageIn
@Override
public String toString() {
return "DistributionPackageInfo{" +
- "origin=" + getOrigin() +
- ", requestType=" + getRequestType() +
+ " requestType=" + getRequestType() +
", paths=" + Arrays.toString(getPaths()) +
+ ", origin=" + getOrigin() +
'}';
}
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java?rev=1705852&r1=1705851&r2=1705852&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java Tue Sep 29 12:54:54 2015
@@ -26,6 +26,8 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.distribution.DistributionRequest;
import org.apache.sling.distribution.DistributionRequestType;
import org.apache.sling.distribution.agent.DistributionAgent;
+import org.apache.sling.distribution.log.DistributionLog;
+import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.packaging.DistributionPackageExportException;
import org.apache.sling.distribution.packaging.DistributionPackageExporter;
@@ -44,6 +46,7 @@ import org.slf4j.LoggerFactory;
public class AgentDistributionPackageExporter implements DistributionPackageExporter {
private final Logger log = LoggerFactory.getLogger(getClass());
private final DistributionPackageBuilderProvider packageBuilderProvider;
+ private final String name;
final static String PACKAGE_TYPE = "agentexporter";
@@ -51,8 +54,9 @@ public class AgentDistributionPackageExp
private DistributionAgent agent;
private String queueName;
- public AgentDistributionPackageExporter(String queueName, DistributionAgent agent, DistributionPackageBuilderProvider packageBuilderProvider) {
+ public AgentDistributionPackageExporter(String queueName, DistributionAgent agent, DistributionPackageBuilderProvider packageBuilderProvider, String name) {
this.packageBuilderProvider = packageBuilderProvider;
+ this.name = name;
if (agent == null || packageBuilderProvider == null) {
throw new IllegalArgumentException("Agent and package builder are required");
@@ -88,6 +92,7 @@ public class AgentDistributionPackageExp
if (packageBuilder != null) {
distributionPackage = packageBuilder.getPackage(resourceResolver, queueItem.getId());
+
log.info("item {} fetched from the queue", info);
if (distributionPackage != null) {
result.add(new AgentDistributionPackage(distributionPackage, queue));
@@ -97,7 +102,6 @@ public class AgentDistributionPackageExp
} else {
log.warn("cannot find package builder with type {}", info.getType());
}
-
}
} catch (Exception ex) {
@@ -158,6 +162,16 @@ public class AgentDistributionPackageExp
String id = distributionPackage.getId();
queue.remove(id);
DistributionPackageUtils.releaseOrDelete(distributionPackage, queue.getName());
+ agentLog("exported package {} with info {} from queue {} by exporter {}", new Object[] {id, distributionPackage.getInfo(), queue.getName(), name});
+ }
+ }
+
+
+ private void agentLog(String message, Object[] values) {
+ DistributionLog agentLog = agent.getLog();
+
+ if (agentLog instanceof DefaultDistributionLog) {
+ ((DefaultDistributionLog) agentLog).info(message, values);
}
}
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java?rev=1705852&r1=1705851&r2=1705852&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterFactory.java Tue Sep 29 12:54:54 2015
@@ -74,8 +74,10 @@ public class AgentDistributionPackageExp
public void activate(Map<String, Object> config) throws Exception {
String queueName = PropertiesUtil.toString(config.get(QUEUE_NAME), "");
+ String name = PropertiesUtil.toString(config.get(NAME), "");
- packageExporter = new AgentDistributionPackageExporter(queueName, agent, packageBuilderProvider);
+
+ packageExporter = new AgentDistributionPackageExporter(queueName, agent, packageBuilderProvider, name);
}
@Nonnull
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java?rev=1705852&r1=1705851&r2=1705852&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java Tue Sep 29 12:54:54 2015
@@ -51,7 +51,10 @@ public class JobHandlingUtils {
Map<String, Object> properties = new HashMap<String, Object>();
for (String key : queueItem.keySet()) {
- properties.put(DISTRIBUTION_PACKAGE_PREFIX + key, queueItem.get(key));
+ Object value = queueItem.get(key);
+ if (value != null) {
+ properties.put(DISTRIBUTION_PACKAGE_PREFIX + key, queueItem.get(key));
+ }
}
properties.put(ID, queueItem.getId());
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterTest.java?rev=1705852&r1=1705851&r2=1705852&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporterTest.java Tue Sep 29 12:54:54 2015
@@ -39,7 +39,7 @@ public class AgentDistributionPackageExp
@Test
public void testTestExport() throws Exception {
AgentDistributionPackageExporter distributionPackageExporter = new AgentDistributionPackageExporter(null,
- mock(DistributionAgent.class), mock(DistributionPackageBuilderProvider.class));
+ mock(DistributionAgent.class), mock(DistributionPackageBuilderProvider.class), null);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
DistributionRequest distributionRequest = new SimpleDistributionRequest(DistributionRequestType.TEST, null);
List<DistributionPackage> distributionPackages = distributionPackageExporter.exportPackages(resourceResolver, distributionRequest);