Author: davsclaus
Date: Thu Feb 16 17:18:43 2012
New Revision: 1245089
URL: http://svn.apache.org/viewvc?rev=1245089&view=rev
Log:
CAMEL-5012: Camel is now less verbose when starting and shutting down.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagementStrategyFactory.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1245089&r1=1245088&r2=1245089&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Thu Feb 16 17:18:43 2012
@@ -1607,8 +1607,7 @@ public class DefaultCamelContext extends
stopWatch.stop();
if (log.isInfoEnabled()) {
- log.info("Uptime: " + getUptime());
- log.info("Apache Camel " + getVersion() + " (CamelContext: " +
getName() + ") is shutdown in " + TimeUtils.printDuration(stopWatch.taken()));
+ log.info("Apache Camel " + getVersion() + " (CamelContext: " +
getName() + ") is shutdown in " + TimeUtils.printDuration(stopWatch.taken()) +
". Uptime " + getUptime() + ".");
}
// and clear start date
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java?rev=1245089&r1=1245088&r2=1245089&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
Thu Feb 16 17:18:43 2012
@@ -87,7 +87,7 @@ public class DefaultInflightRepository e
if (count > 0) {
LOG.warn("Shutting down while there are still " + count + " in
flight exchanges.");
} else {
- LOG.info("Shutting down with no inflight exchanges.");
+ LOG.debug("Shutting down with no inflight exchanges.");
}
endpointCount.clear();
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java?rev=1245089&r1=1245088&r2=1245089&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
Thu Feb 16 17:18:43 2012
@@ -142,6 +142,11 @@ public class DefaultShutdownStrategy ext
protected boolean doShutdown(CamelContext context, List<RouteStartupOrder>
routes, long timeout, TimeUnit timeUnit,
boolean suspendOnly, boolean
abortAfterTimeout, boolean forceShutdown) throws Exception {
+ // just return if no routes to shutdown
+ if (routes.isEmpty()) {
+ return true;
+ }
+
StopWatch watch = new StopWatch();
// at first sort according to route startup order
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java?rev=1245089&r1=1245088&r2=1245089&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
Thu Feb 16 17:18:43 2012
@@ -106,7 +106,7 @@ public class AnnotationTypeConverterLoad
Set<Class<?>> classes = new HashSet<Class<?>>();
packageNames = filterPackageNamesOnly(resolver, packageNames, classes);
if (!classes.isEmpty()) {
- LOG.info("Loaded " + classes.size() + " @Converter classes");
+ LOG.debug("Loaded " + classes.size() + " @Converter classes");
}
// if there is any packages to scan and load @Converter classes, then
do it
@@ -116,7 +116,7 @@ public class AnnotationTypeConverterLoad
if (scannedClasses.isEmpty()) {
throw new TypeConverterLoaderException("Cannot find any type
converter classes from the following packages: " + Arrays.asList(packageNames));
}
- LOG.info("Found " + packageNames.length + " packages with " +
scannedClasses.size() + " @Converter classes to load");
+ LOG.debug("Found " + packageNames.length + " packages with " +
scannedClasses.size() + " @Converter classes to load");
classes.addAll(scannedClasses);
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java?rev=1245089&r1=1245088&r2=1245089&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
Thu Feb 16 17:18:43 2012
@@ -389,19 +389,12 @@ public abstract class BaseTypeConverterR
// load all the type converters from camel-core
CoreTypeConverterLoader core = new CoreTypeConverterLoader();
core.load(this);
-
- int delta = typeMappings.size() - before;
- log.info("Loaded {} core type converters (total {} type converters)" ,
delta, typeMappings.size());
}
/**
* Checks if the registry is loaded and if not lazily load it
*/
protected void loadTypeConverters() throws Exception {
- StopWatch watch = new StopWatch();
- int before = typeMappings.size();
-
- log.debug("Loading additional type converters ...");
for (TypeConverterLoader typeConverterLoader :
getTypeConverterLoaders()) {
typeConverterLoader.load(this);
}
@@ -412,14 +405,6 @@ public abstract class BaseTypeConverterR
} catch (NoFactoryAvailableException e) {
// ignore its fine to have none
}
- log.debug("Loading additional type converters done");
-
- // report how long time it took to load
- int delta = typeMappings.size() - before;
- if (log.isInfoEnabled()) {
- log.info("Loaded additional " + delta + " type converters (total "
+ typeMappings.size()
- + " type converters) in " +
TimeUtils.printDuration(watch.stop()));
- }
}
protected void loadFallbackTypeConverters() throws IOException,
ClassNotFoundException {
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java?rev=1245089&r1=1245088&r2=1245089&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
Thu Feb 16 17:18:43 2012
@@ -40,6 +40,9 @@ public class DefaultTypeConverter extend
// load type converters up front
loadCoreTypeConverters();
loadTypeConverters();
+
+ // report how many type converters we have loaded
+ log.info("Loaded {} type converters", typeMappings.size());
}
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagementStrategyFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagementStrategyFactory.java?rev=1245089&r1=1245088&r2=1245089&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagementStrategyFactory.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagementStrategyFactory.java
Thu Feb 16 17:18:43 2012
@@ -32,18 +32,18 @@ public class ManagementStrategyFactory {
ManagementStrategy answer = null;
if (disableJMX || Boolean.getBoolean(JmxSystemPropertyKeys.DISABLED)) {
- log.info("JMX is disabled. Using DefaultManagementStrategy.");
+ log.info("JMX is disabled.");
} else {
try {
- log.info("JMX enabled. Using ManagedManagementStrategy.");
- answer = new ManagedManagementStrategy(new
DefaultManagementAgent(context));
+ ManagedManagementStrategy jmx = new
ManagedManagementStrategy(new DefaultManagementAgent(context));
// must start it to ensure JMX works and can load needed
Spring JARs
- ServiceHelper.startService(answer);
+ ServiceHelper.startService(jmx);
// prefer to have it at first strategy
context.getLifecycleStrategies().add(0, new
DefaultManagementLifecycleStrategy(context));
+ log.info("JMX enabled.");
} catch (Exception e) {
answer = null;
- log.warn("Cannot create JMX lifecycle strategy. Fallback to
using DefaultManagementStrategy (non JMX).", e);
+ log.warn("Cannot create JMX lifecycle strategy. Will fallback
and disable JMX.", e);
}
}
