svn commit: r1423957 - in /archiva/trunk/archiva-modules: archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ archiva-web/archiva-webapp-js/src/test/tomcat/

[olamy]

Author: olamy
Date: Wed Dec 19 17:08:38 2012
New Revision: 1423957

URL: http://svn.apache.org/viewvc?rev=1423957&view=rev
Log:
[MRM-1729] add MetadataRepository#hasMetadataFacet to prevent slow startup time
better fix it looks I missed something :-)

Modified:
    
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j2-test.xml

Modified: 
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java?rev=1423957&r1=1423956&r2=1423957&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
 Wed Dec 19 17:08:38 2012
@@ -56,7 +56,7 @@ import java.util.Set;
 /**
  * Default implementation of a scheduling component for archiva.
  */
-@Service("archivaTaskScheduler#repository")
+@Service( "archivaTaskScheduler#repository" )
 public class DefaultRepositoryArchivaTaskScheduler
     implements RepositoryArchivaTaskScheduler, ConfigurationListener
 {
@@ -75,7 +75,7 @@ public class DefaultRepositoryArchivaTas
      *
      */
     @Inject
-    @Named(value = "taskQueue#repository-scanning")
+    @Named( value = "taskQueue#repository-scanning" )
     private TaskQueue repositoryScanningQueue;
 
     /**
@@ -88,7 +88,7 @@ public class DefaultRepositoryArchivaTas
      *
      */
     @Inject
-    @Named(value = "repositoryStatisticsManager#default")
+    @Named( value = "repositoryStatisticsManager#default" )
     private RepositoryStatisticsManager repositoryStatisticsManager;
 
     /**
@@ -181,7 +181,7 @@ public class DefaultRepositoryArchivaTas
 
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings( "unchecked" )
     public boolean isProcessingRepositoryTask( String repositoryId )
     {
         synchronized ( repositoryScanningQueue )
@@ -309,8 +309,15 @@ public class DefaultRepositoryArchivaTas
                                          MetadataRepository metadataRepository 
)
         throws MetadataRepositoryException
     {
+        long start = System.currentTimeMillis();
 
-        return repositoryStatisticsManager.getLastStatistics( 
metadataRepository, repoConfig.getId() ) != null;
+        boolean res = repositoryStatisticsManager.hasStatistics( 
metadataRepository, repoConfig.getId() );
+
+        long end = System.currentTimeMillis();
+
+        log.debug( "isPreviouslyScanned repo {} {} time: {} ms", 
repoConfig.getId(), res, ( end - start ) );
+
+        return res;
     }
 
     // MRM-848: Pre-configured repository initially appear to be empty

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j2-test.xml
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j2-test.xml?rev=1423957&r1=1423956&r2=1423957&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j2-test.xml
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j2-test.xml
 Wed Dec 19 17:08:38 2012
@@ -81,6 +81,8 @@
 
     <logger 
name="org.apache.archiva.metadata.repository.stats.DefaultRepositoryStatisticsManager"
 level="debug" />
 
+    <logger 
name="org.apache.archiva.scheduler.repository.DefaultRepositoryArchivaTaskScheduler"
 level="debug"/>
+
     <root level="info">
       <appender-ref ref="console"/>
     </root>