svn commit: r1705862 - /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java

[mpetria]

Author: mpetria
Date: Tue Sep 29 13:44:00 2015
New Revision: 1705862

URL: http://svn.apache.org/viewvc?rev=1705862&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/AbstractDistributionAgentFactory.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java?rev=1705862&r1=1705861&r2=1705862&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/AbstractDistributionAgentFactory.java
 Tue Sep 29 13:44:00 2015
@@ -28,6 +28,7 @@ import org.apache.sling.commons.osgi.Pro
 import org.apache.sling.distribution.agent.DistributionAgent;
 import 
org.apache.sling.distribution.component.impl.DistributionComponentConstants;
 import org.apache.sling.distribution.component.impl.DistributionComponentKind;
+import org.apache.sling.distribution.log.DistributionLog;
 import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
 import org.apache.sling.distribution.resources.impl.OsgiUtils;
 import org.apache.sling.distribution.trigger.DistributionTrigger;
@@ -88,6 +89,7 @@ public abstract class AbstractDistributi
 
             if (componentReg == null) {
 
+                DefaultDistributionLog distributionLog = null;
                 try {
 
                     String logLevel = 
PropertiesUtil.toString(config.get(LOG_LEVEL), 
DefaultDistributionLog.LogLevel.INFO.name());
@@ -97,11 +99,14 @@ public abstract class AbstractDistributi
                     }
 
 
-                    DefaultDistributionLog distributionLog = new 
DefaultDistributionLog(DistributionComponentKind.AGENT, agentName, 
SimpleDistributionAgent.class, level);
+                    distributionLog = new 
DefaultDistributionLog(DistributionComponentKind.AGENT, agentName, 
SimpleDistributionAgent.class, level);
 
                     agent = createAgent(agentName, context, config, 
distributionLog);
-                } catch (IllegalArgumentException e) {
-                    log.warn("cannot create agent", e);
+                } catch (Throwable t) {
+                    if (distributionLog != null) {
+                        distributionLog.error("Cannot create agent", t);
+                    }
+                    log.error("Cannot create agent", t);
                 }