Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Jan Bartel 2016-07-07 15:13:27 +10:00
commit 15b5920349
1 changed files with 4 additions and 1 deletions

View File

@ -559,6 +559,9 @@ public class AnnotationConfiguration extends AbstractConfiguration
} }
boolean timeout = !latch.await(getMaxScanWait(context), TimeUnit.SECONDS); boolean timeout = !latch.await(getMaxScanWait(context), TimeUnit.SECONDS);
long elapsedMs = TimeUnit.MILLISECONDS.convert(System.nanoTime()-start, TimeUnit.NANOSECONDS);
LOG.info("Scanning elapsed time={}ms",elapsedMs);
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
{ {
@ -567,7 +570,7 @@ public class AnnotationConfiguration extends AbstractConfiguration
LOG.debug("Scanned {} container path jars, {} WEB-INF/lib jars, {} WEB-INF/classes dirs in {}ms for context {}", LOG.debug("Scanned {} container path jars, {} WEB-INF/lib jars, {} WEB-INF/classes dirs in {}ms for context {}",
_containerPathStats.getTotal(), _webInfLibStats.getTotal(), _webInfClassesStats.getTotal(), _containerPathStats.getTotal(), _webInfLibStats.getTotal(), _webInfClassesStats.getTotal(),
(TimeUnit.MILLISECONDS.convert(System.nanoTime()-start, TimeUnit.NANOSECONDS)), elapsedMs,
context); context);
} }