Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve logging and no need to pack local index of remote repositories 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1443759 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-02-07 22:21:55 +00:00
parent 440d85c3cc
commit f60f64732a
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
View File

@ -187,7 +187,7 @@ public class DefaultDownloadRemoteIndexScheduler
if ( now ) if ( now )
{ {
log.info( "schedule download remote index for repository {}", remoteRepository.getId() ); log.info( "schedule download remote index for repository {}", remoteRepository.getId() );
// do it in async // do it now
taskScheduler.schedule( taskScheduler.schedule(
new DownloadRemoteIndexTask( downloadRemoteIndexTaskRequest, this.runningRemoteDownloadIds ), new DownloadRemoteIndexTask( downloadRemoteIndexTaskRequest, this.runningRemoteDownloadIds ),
new Date() ); new Date() );

20
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
View File

@ -84,7 +84,6 @@ public class DownloadRemoteIndexTask
private IndexUpdater indexUpdater; private IndexUpdater indexUpdater;
private IndexPacker indexPacker;
public DownloadRemoteIndexTask( DownloadRemoteIndexTaskRequest downloadRemoteIndexTaskRequest, public DownloadRemoteIndexTask( DownloadRemoteIndexTaskRequest downloadRemoteIndexTaskRequest,
List<String> runningRemoteDownloadIds ) List<String> runningRemoteDownloadIds )
@ -96,7 +95,6 @@ public class DownloadRemoteIndexTask
this.runningRemoteDownloadIds = runningRemoteDownloadIds; this.runningRemoteDownloadIds = runningRemoteDownloadIds;
this.indexUpdater = downloadRemoteIndexTaskRequest.getIndexUpdater(); this.indexUpdater = downloadRemoteIndexTaskRequest.getIndexUpdater();
this.remoteRepositoryAdmin = downloadRemoteIndexTaskRequest.getRemoteRepositoryAdmin(); this.remoteRepositoryAdmin = downloadRemoteIndexTaskRequest.getRemoteRepositoryAdmin();
this.indexPacker = downloadRemoteIndexTaskRequest.getIndexPacker();
} }
public void run() public void run()
@ -188,13 +186,13 @@ public class DownloadRemoteIndexTask
this.indexUpdater.fetchAndUpdateIndex( request ); this.indexUpdater.fetchAndUpdateIndex( request );
stopWatch.stop(); stopWatch.stop();
log.info( "time to download remote repository index for repository {}: {} s", this.remoteRepository.getId(), log.info( "time update index from remote for repository {}: {} s", this.remoteRepository.getId(),
( stopWatch.getTime() / 1000 ) ); ( stopWatch.getTime() / 1000 ) );
// index packing optionnal ?? // index packing optionnal ??
IndexPackingRequest indexPackingRequest = //IndexPackingRequest indexPackingRequest =
new IndexPackingRequest( indexingContext, indexingContext.getIndexDirectoryFile() ); // new IndexPackingRequest( indexingContext, indexingContext.getIndexDirectoryFile() );
indexPacker.packIndex( indexPackingRequest ); //indexPacker.packIndex( indexPackingRequest );
indexingContext.updateTimestamp( true ); indexingContext.updateTimestamp( true );
} }
@ -258,30 +256,34 @@ public class DownloadRemoteIndexTask
private long startTime; private long startTime;
private int totalLength = 0;
public void transferInitiated( TransferEvent transferEvent ) public void transferInitiated( TransferEvent transferEvent )
{ {
startTime = System.currentTimeMillis();
resourceName = transferEvent.getResource().getName(); resourceName = transferEvent.getResource().getName();
log.debug( "initiate transfer of {}", resourceName ); log.debug( "initiate transfer of {}", resourceName );
} }
public void transferStarted( TransferEvent transferEvent ) public void transferStarted( TransferEvent transferEvent )
{ {
this.totalLength = 0;
resourceName = transferEvent.getResource().getName(); resourceName = transferEvent.getResource().getName();
startTime = System.currentTimeMillis();
log.info( "start transfer of {}", transferEvent.getResource().getName() ); log.info( "start transfer of {}", transferEvent.getResource().getName() );
} }
public void transferProgress( TransferEvent transferEvent, byte[] buffer, int length ) public void transferProgress( TransferEvent transferEvent, byte[] buffer, int length )
{ {
log.debug( "transfer of {} : {}/{}", transferEvent.getResource().getName(), buffer.length, length ); log.debug( "transfer of {} : {}/{}", transferEvent.getResource().getName(), buffer.length, length );
this.totalLength += length;
} }
public void transferCompleted( TransferEvent transferEvent ) public void transferCompleted( TransferEvent transferEvent )
{ {
resourceName = transferEvent.getResource().getName(); resourceName = transferEvent.getResource().getName();
long endTime = System.currentTimeMillis(); long endTime = System.currentTimeMillis();
log.info( "end of transfer file {}: {}s", transferEvent.getResource().getName(), log.info( "end of transfer file {} {} kb: {}s", transferEvent.getResource().getName(),
( endTime - startTime ) / 1000 ); this.totalLength / 1024, ( endTime - startTime ) / 1000 );
} }
public void transferError( TransferEvent transferEvent ) public void transferError( TransferEvent transferEvent )