You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/12/10 02:29:52 UTC
svn commit: r1549732 - in /archiva/trunk/archiva-modules:
archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/
archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/reposi...
Author: olamy
Date: Tue Dec 10 01:29:51 2013
New Revision: 1549732
URL: http://svn.apache.org/r1549732
Log:
cleanup logging on shutdown
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java?rev=1549732&r1=1549731&r2=1549732&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java Tue Dec 10 01:29:51 2013
@@ -60,9 +60,6 @@ public class ArchivaIndexingTaskExecutor
{
private Logger log = LoggerFactory.getLogger( ArchivaIndexingTaskExecutor.class );
- /**
- *
- */
private IndexPacker indexPacker;
private ArtifactContextProducer artifactContextProducer;
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java?rev=1549732&r1=1549731&r2=1549732&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java Tue Dec 10 01:29:51 2013
@@ -57,29 +57,17 @@ public class ArchivaRepositoryScanningTa
{
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;
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java?rev=1549732&r1=1549731&r2=1549732&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java Tue Dec 10 01:29:51 2013
@@ -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.ExecutorServ
/**
* 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;
}