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/11/18 15:04:13 UTC
svn commit: r1714995 - in /sling/trunk/contrib/extensions/distribution/core:
./ src/main/java/org/apache/sling/distribution/agent/impl/
src/main/java/org/apache/sling/distribution/packaging/impl/
src/main/java/org/apache/sling/distribution/serializatio...
Author: mpetria
Date: Wed Nov 18 14:04:13 2015
New Revision: 1714995
URL: http://svn.apache.org/viewvc?rev=1714995&view=rev
Log:
SLING-5179: fix some logging and exports
Modified:
sling/trunk/contrib/extensions/distribution/core/pom.xml
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/impl/DistributionPackageUtils.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/DistributionPackageInfo.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java
Modified: sling/trunk/contrib/extensions/distribution/core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/pom.xml?rev=1714995&r1=1714994&r2=1714995&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/core/pom.xml Wed Nov 18 14:04:13 2015
@@ -68,7 +68,7 @@
<instructions>
<Bundle-SymbolicName>org.apache.sling.distribution.core</Bundle-SymbolicName>
<Export-Package>
- org.apache.sling.distribution.util,org.apache.sling.distribution.serialization,org.apache.sling.distribution.common
+ org.apache.sling.distribution.util
</Export-Package>
<Embed-Dependency>httpasyncclient</Embed-Dependency>
</instructions>
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=1714995&r1=1714994&r2=1714995&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 Wed Nov 18 14:04:13 2015
@@ -43,6 +43,7 @@ import org.apache.sling.distribution.Dis
import org.apache.sling.distribution.agent.DistributionAgent;
import org.apache.sling.distribution.agent.DistributionAgentState;
import org.apache.sling.distribution.component.impl.DistributionComponentKind;
+import org.apache.sling.distribution.component.impl.SettingsUtils;
import org.apache.sling.distribution.event.DistributionEventTopics;
import org.apache.sling.distribution.event.impl.DistributionEventFactory;
import org.apache.sling.distribution.impl.CompositeDistributionResponse;
@@ -123,10 +124,8 @@ public class SimpleDistributionAgent imp
this.slingRepository = slingRepository;
this.log = log;
this.allowedRequests = allowedRequests;
- this.allowedRoots = allowedRoots;
this.processingQueues = processingQueues;
this.retryAttempts = retryAttempts;
- this.impersonateUser = subServiceName == null;
// check configuration is valid
if (name == null
@@ -150,10 +149,12 @@ public class SimpleDistributionAgent imp
throw new IllegalArgumentException("all arguments are required: " + errorMessage);
}
- this.subServiceName = subServiceName;
+ this.allowedRoots = SettingsUtils.removeEmptyEntries(allowedRoots);
+ this.subServiceName = SettingsUtils.removeEmptyEntry(subServiceName);
+ this.impersonateUser = this.subServiceName == null;
this.distributionRequestAuthorizationStrategy = distributionRequestAuthorizationStrategy;
this.resourceResolverFactory = resourceResolverFactory;
- this.name = name;
+ this.name = SettingsUtils.removeEmptyEntry(name);
this.queueProcessingEnabled = queueProcessingEnabled;
this.distributionPackageImporter = distributionPackageImporter;
this.distributionPackageExporter = distributionPackageExporter;
@@ -212,7 +213,7 @@ public class SimpleDistributionAgent imp
}
private List<DistributionPackage> exportPackages(ResourceResolver agentResourceResolver, DistributionRequest distributionRequest) throws DistributionException {
- log.info("exporting packages for user {}", agentResourceResolver != null ? agentResourceResolver.getUserID() : "dummy");
+ log.info("exporting packages with user {}", agentResourceResolver != null ? agentResourceResolver.getUserID() : "dummy");
List<DistributionPackage> distributionPackages = distributionPackageExporter.exportPackages(agentResourceResolver, distributionRequest);
@@ -408,7 +409,7 @@ public class SimpleDistributionAgent imp
DistributionPackageUtils.releaseOrDelete(distributionPackage, queueName);
}
- log.info("processed package {} with info {} from queue {}", distributionPackage.getId(), distributionPackage.getInfo(), queueName);
+ log.info("processed queue {} package {} with info {}", queueName, distributionPackage.getId(), distributionPackage.getInfo());
} 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());
@@ -552,8 +553,8 @@ public class SimpleDistributionAgent imp
return success;
- } catch (Throwable e) {
- log.error("queue {} error while processing item {}", queueName, queueItem);
+ } catch (Throwable t) {
+ log.error("queue {} error while processing item {} {}", new Object[] { queueName, queueItem, t} );
return false;
}
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java?rev=1714995&r1=1714994&r2=1714995&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/packaging/impl/DistributionPackageUtils.java Wed Nov 18 14:04:13 2015
@@ -19,6 +19,7 @@
package org.apache.sling.distribution.packaging.impl;
+import org.apache.sling.distribution.DistributionRequest;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueStatus;
import org.apache.sling.distribution.serialization.DistributionPackage;
@@ -28,6 +29,10 @@ import org.apache.sling.distribution.que
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+
/**
* Package related utility methods
*/
@@ -118,4 +123,22 @@ public class DistributionPackageUtils {
packageInfo.put(PACKAGE_INFO_PROPERTY_ORIGIN_QUEUE, entry.getStatus().getQueueName());
}
+
+ public static void fillInfo(DistributionPackageInfo info, DistributionRequest request) {
+ info.put(DistributionPackageInfo.PROPERTY_REQUEST_TYPE, request.getRequestType());
+ info.put(DistributionPackageInfo.PROPERTY_REQUEST_PATHS, request.getPaths());
+ info.put(DistributionPackageInfo.PROPERTY_REQUEST_DEEP_PATHS, getDeepPaths(request));
+ }
+
+ public static String[] getDeepPaths(DistributionRequest request) {
+ List<String> deepPaths = new ArrayList<String>();
+ for (String path : request.getPaths()) {
+ if (request.isDeep(path)) {
+ deepPaths.add(path);
+ }
+ }
+
+ return deepPaths.toArray(new String[0]);
+ }
+
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/DistributionPackageInfo.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/DistributionPackageInfo.java?rev=1714995&r1=1714994&r2=1714995&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/DistributionPackageInfo.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/DistributionPackageInfo.java Wed Nov 18 14:04:13 2015
@@ -48,6 +48,12 @@ public final class DistributionPackageIn
public static String PROPERTY_REQUEST_PATHS = "request.paths";
/**
+ * distribution request deep paths
+ */
+ public static String PROPERTY_REQUEST_DEEP_PATHS = "request.deepPaths";
+
+
+ /**
* distribution request type
*/
public static String PROPERTY_REQUEST_TYPE = "request.type";
@@ -105,8 +111,9 @@ public final class DistributionPackageIn
@Override
public String toString() {
return "DistributionPackageInfo{" +
- " request.type=" + getRequestType() +
- ", request.paths=" + Arrays.toString(getPaths()) +
+ " request.type=" + get(PROPERTY_REQUEST_TYPE, DistributionRequestType.class) +
+ ", request.paths=" + Arrays.toString(get(PROPERTY_REQUEST_PATHS, String[].class)) +
+ ", request.deepPaths=" + Arrays.toString(get(PROPERTY_REQUEST_DEEP_PATHS, String[].class)) +
'}';
}
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java?rev=1714995&r1=1714994&r2=1714995&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/AbstractDistributionPackageBuilder.java Wed Nov 18 14:04:13 2015
@@ -29,6 +29,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.distribution.DistributionRequest;
import org.apache.sling.distribution.DistributionRequestType;
import org.apache.sling.distribution.common.DistributionException;
+import org.apache.sling.distribution.packaging.impl.DistributionPackageUtils;
import org.apache.sling.distribution.serialization.DistributionPackage;
import org.apache.sling.distribution.serialization.DistributionPackageInfo;
import org.apache.sling.distribution.serialization.DistributionPackageBuilder;
@@ -74,8 +75,7 @@ public abstract class AbstractDistributi
throw new DistributionException("unknown action type " + request.getRequestType());
}
- distributionPackage.getInfo().put(DistributionPackageInfo.PROPERTY_REQUEST_TYPE, request.getRequestType());
- distributionPackage.getInfo().put(DistributionPackageInfo.PROPERTY_REQUEST_PATHS, request.getPaths());
+ DistributionPackageUtils.fillInfo(distributionPackage.getInfo(), request);
return distributionPackage;
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java?rev=1714995&r1=1714994&r2=1714995&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java Wed Nov 18 14:04:13 2015
@@ -84,7 +84,7 @@ public class SimpleHttpDistributionTrans
URI packageOrigin = distributionPackage.getInfo().get(PACKAGE_INFO_PROPERTY_ORIGIN_URI, URI.class);
if (packageOrigin != null && hostAndPort.equals(getHostAndPort(packageOrigin))) {
- log.info("skipping distribution of package {}Â to same origin {}", distributionPackage.getId(), hostAndPort);
+ log.debug("skipping distribution of package {}Â to same origin {}", distributionPackage.getId(), hostAndPort);
} else {
@@ -93,9 +93,7 @@ public class SimpleHttpDistributionTrans
DistributionTransportSecret secret = secretProvider.getSecret(distributionEndpoint.getUri());
- log.info("delivering package {} to {} with user {}", distributionPackage.getId(),
- distributionEndpoint.getUri(),
- secret.asCredentialsMap().get(USERNAME));
+ log.debug("delivering package {} to {} with user {}", distributionPackage.getId(), distributionEndpoint.getUri(), secret.asCredentialsMap().get(USERNAME));
executor = authenticate(secret, executor);
@@ -113,9 +111,7 @@ public class SimpleHttpDistributionTrans
}
Content content = response.returnContent();
- log.info("delivered package {} of type {} with paths {}", distributionPackage.getId(),
- distributionPackage.getType(),
- Arrays.toString(distributionPackage.getInfo().getPaths()));
+ log.debug("delivered package {} to {}", distributionPackage.getId(), distributionEndpoint.getUri());
} catch (Throwable ex) {
throw new DistributionException(ex);
}