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

cleanup logging on shutdown 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1549732 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-12-10 01:29:51 +00:00
parent d1de91d824
commit 3ee1c5f9ff
3 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
View File

@ -60,9 +60,6 @@ public class ArchivaIndexingTaskExecutor
{
private Logger log = LoggerFactory.getLogger( ArchivaIndexingTaskExecutor.class );
/**
*
*/
private IndexPacker indexPacker;
private ArtifactContextProducer artifactContextProducer;

12
archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
View File

@ -57,29 +57,17 @@ public class ArchivaRepositoryScanningTaskExecutor
{
private Logger log = LoggerFactory.getLogger( ArchivaRepositoryScanningTaskExecutor.class );
/**
*
*/
@Inject
private ManagedRepositoryAdmin managedRepositoryAdmin;
/**
* The repository scanner component.
*/
@Inject
private RepositoryScanner repoScanner;
/**
*
*/
@Inject
private RepositoryContentConsumers consumers;
private Task task;
/**
*
*/
@Inject
private RepositoryStatisticsManager repositoryStatisticsManager;

28
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
View File

@ -32,6 +32,7 @@ import org.quartz.SchedulerException;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import java.lang.reflect.Field;
@ -40,8 +41,6 @@ import java.util.concurrent.ExecutorService;
/**
* ArchivaStartup - the startup of all archiva features in a deterministic order.
*
*
*/
public class ArchivaStartup
implements ServletContextListener
@ -101,6 +100,9 @@ public class ArchivaStartup
WebApplicationContext applicationContext =
WebApplicationContextUtils.getRequiredWebApplicationContext( contextEvent.getServletContext() );
ServletContext servletContext = contextEvent.getServletContext();
// TODO check this stop
/*
@ -112,9 +114,9 @@ public class ArchivaStartup
if ( applicationContext != null ) //&& applicationContext instanceof PlexusWebApplicationContext )
{
// stop task queue executors
stopTaskQueueExecutor( tqeDbScanning );
stopTaskQueueExecutor( tqeRepoScanning );
stopTaskQueueExecutor( tqeIndexing );
stopTaskQueueExecutor( tqeDbScanning, servletContext );
stopTaskQueueExecutor( tqeRepoScanning, servletContext );
stopTaskQueueExecutor( tqeIndexing, servletContext );
// stop the DefaultArchivaTaskScheduler and its scheduler
if ( repositoryTaskScheduler != null )
@ -125,7 +127,7 @@ public class ArchivaStartup
}
catch ( SchedulerException e )
{
e.printStackTrace();
servletContext.log( e.getMessage(), e );
}
try
@ -139,7 +141,7 @@ public class ArchivaStartup
}
catch ( Exception e )
{
e.printStackTrace();
servletContext.log( e.getMessage(), e );
}
}
@ -158,13 +160,13 @@ public class ArchivaStartup
}
catch ( Exception e )
{
contextEvent.getServletContext().log( "skip error closing indexingContext " + e.getMessage() );
servletContext.log( "skip error closing indexingContext " + e.getMessage(), e );
}
}
}
private void stopTaskQueueExecutor( ThreadedTaskQueueExecutor taskQueueExecutor )
private void stopTaskQueueExecutor( ThreadedTaskQueueExecutor taskQueueExecutor, ServletContext servletContext )
{
if ( taskQueueExecutor != null )
{
@ -177,7 +179,7 @@ public class ArchivaStartup
try
{
taskQueueExecutor.stop();
ExecutorService service = getExecutorServiceForTTQE( taskQueueExecutor );
ExecutorService service = getExecutorServiceForTTQE( taskQueueExecutor, servletContext );
if ( service != null )
{
service.shutdown();
@ -185,12 +187,12 @@ public class ArchivaStartup
}
catch ( Exception e )
{
e.printStackTrace();
servletContext.log( e.getMessage(), e );
}
}
}
private ExecutorService getExecutorServiceForTTQE( ThreadedTaskQueueExecutor ttqe )
private ExecutorService getExecutorServiceForTTQE( ThreadedTaskQueueExecutor ttqe, ServletContext servletContext )
{
ExecutorService service = null;
try
@ -201,7 +203,7 @@ public class ArchivaStartup
}
catch ( Exception e )
{
e.printStackTrace();
servletContext.log( e.getMessage(), e );
}
return service;
}