You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/12/20 19:00:05 UTC
svn commit: r1647027 - in /manifoldcf/branches/CONNECTORS-1119/framework:
api-service/src/main/java/org/apache/manifoldcf/apiservice/
combined-service/src/main/java/org/apache/manifoldcf/combinedservice/
crawler-ui/src/main/java/org/apache/manifoldcf/c...
Author: kwright
Date: Sat Dec 20 18:00:05 2014
New Revision: 1647027
URL: http://svn.apache.org/r1647027
Log:
Hook up notification connector pool.
Modified:
manifoldcf/branches/CONNECTORS-1119/framework/api-service/src/main/java/org/apache/manifoldcf/apiservice/IdleCleanupThread.java
manifoldcf/branches/CONNECTORS-1119/framework/combined-service/src/main/java/org/apache/manifoldcf/combinedservice/IdleCleanupThread.java
manifoldcf/branches/CONNECTORS-1119/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/IdleCleanupThread.java
manifoldcf/branches/CONNECTORS-1119/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java
manifoldcf/branches/CONNECTORS-1119/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/IdleCleanupThread.java
manifoldcf/branches/CONNECTORS-1119/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
Modified: manifoldcf/branches/CONNECTORS-1119/framework/api-service/src/main/java/org/apache/manifoldcf/apiservice/IdleCleanupThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1119/framework/api-service/src/main/java/org/apache/manifoldcf/apiservice/IdleCleanupThread.java?rev=1647027&r1=1647026&r2=1647027&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1119/framework/api-service/src/main/java/org/apache/manifoldcf/apiservice/IdleCleanupThread.java (original)
+++ manifoldcf/branches/CONNECTORS-1119/framework/api-service/src/main/java/org/apache/manifoldcf/apiservice/IdleCleanupThread.java Sat Dec 20 18:00:05 2014
@@ -53,6 +53,7 @@ public class IdleCleanupThread extends T
IThreadContext threadContext = ThreadContextFactory.make();
IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(threadContext);
+ INotificationConnectorPool notificationConnectorPool = NotificationConnectorPoolFactory.make(threadContext);
IOutputConnectorPool outputConnectorPool = OutputConnectorPoolFactory.make(threadContext);
ITransformationConnectorPool transformationConnectorPool = TransformationConnectorPoolFactory.make(threadContext);
IAuthorityConnectorPool authorityConnectorPool = AuthorityConnectorPoolFactory.make(threadContext);
@@ -66,6 +67,7 @@ public class IdleCleanupThread extends T
{
// Do the cleanup
repositoryConnectorPool.pollAllConnectors();
+ notificationConnectorPool.pollAllConnectors();
outputConnectorPool.pollAllConnectors();
transformationConnectorPool.pollAllConnectors();
authorityConnectorPool.pollAllConnectors();
Modified: manifoldcf/branches/CONNECTORS-1119/framework/combined-service/src/main/java/org/apache/manifoldcf/combinedservice/IdleCleanupThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1119/framework/combined-service/src/main/java/org/apache/manifoldcf/combinedservice/IdleCleanupThread.java?rev=1647027&r1=1647026&r2=1647027&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1119/framework/combined-service/src/main/java/org/apache/manifoldcf/combinedservice/IdleCleanupThread.java (original)
+++ manifoldcf/branches/CONNECTORS-1119/framework/combined-service/src/main/java/org/apache/manifoldcf/combinedservice/IdleCleanupThread.java Sat Dec 20 18:00:05 2014
@@ -53,6 +53,7 @@ public class IdleCleanupThread extends T
IThreadContext threadContext = ThreadContextFactory.make();
IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(threadContext);
+ INotificationConnectorPool notificationConnectorPool = NotificationConnectorPoolFactory.make(threadContext);
IOutputConnectorPool outputConnectorPool = OutputConnectorPoolFactory.make(threadContext);
ITransformationConnectorPool transformationConnectorPool = TransformationConnectorPoolFactory.make(threadContext);
IAuthorityConnectorPool authorityConnectorPool = AuthorityConnectorPoolFactory.make(threadContext);
@@ -66,6 +67,7 @@ public class IdleCleanupThread extends T
{
// Do the cleanup
repositoryConnectorPool.pollAllConnectors();
+ notificationConnectorPool.pollAllConnectors();
outputConnectorPool.pollAllConnectors();
transformationConnectorPool.pollAllConnectors();
authorityConnectorPool.pollAllConnectors();
Modified: manifoldcf/branches/CONNECTORS-1119/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/IdleCleanupThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1119/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/IdleCleanupThread.java?rev=1647027&r1=1647026&r2=1647027&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1119/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/IdleCleanupThread.java (original)
+++ manifoldcf/branches/CONNECTORS-1119/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/IdleCleanupThread.java Sat Dec 20 18:00:05 2014
@@ -53,6 +53,7 @@ public class IdleCleanupThread extends T
IThreadContext threadContext = ThreadContextFactory.make();
IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(threadContext);
+ INotificationConnectorPool notificationConnectorPool = NotificationConnectorPoolFactory.make(threadContext);
IOutputConnectorPool outputConnectorPool = OutputConnectorPoolFactory.make(threadContext);
ITransformationConnectorPool transformationConnectorPool = TransformationConnectorPoolFactory.make(threadContext);
IAuthorityConnectorPool authorityConnectorPool = AuthorityConnectorPoolFactory.make(threadContext);
@@ -66,6 +67,7 @@ public class IdleCleanupThread extends T
{
// Do the cleanup
repositoryConnectorPool.pollAllConnectors();
+ notificationConnectorPool.pollAllConnectors();
outputConnectorPool.pollAllConnectors();
transformationConnectorPool.pollAllConnectors();
authorityConnectorPool.pollAllConnectors();
Modified: manifoldcf/branches/CONNECTORS-1119/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1119/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java?rev=1647027&r1=1647026&r2=1647027&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1119/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java (original)
+++ manifoldcf/branches/CONNECTORS-1119/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java Sat Dec 20 18:00:05 2014
@@ -784,6 +784,7 @@ public class CrawlerAgent implements IAg
// Threads are down; release connectors
RepositoryConnectorPoolFactory.make(threadContext).flushUnusedConnectors();
+ NotificationConnectorPoolFactory.make(threadContext).flushUnusedConnectors();
numWorkerThreads = 0;
numDeleteThreads = 0;
numExpireThreads = 0;
Modified: manifoldcf/branches/CONNECTORS-1119/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/IdleCleanupThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1119/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/IdleCleanupThread.java?rev=1647027&r1=1647026&r2=1647027&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1119/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/IdleCleanupThread.java (original)
+++ manifoldcf/branches/CONNECTORS-1119/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/IdleCleanupThread.java Sat Dec 20 18:00:05 2014
@@ -56,6 +56,7 @@ public class IdleCleanupThread extends T
IThreadContext threadContext = ThreadContextFactory.make();
IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(threadContext);
+ INotificationConnectorPool notificationConnectorPool = NotificationConnectorPoolFactory.make(threadContext);
// Loop
while (true)
@@ -65,6 +66,7 @@ public class IdleCleanupThread extends T
{
// Do the cleanup
repositoryConnectorPool.pollAllConnectors();
+ notificationConnectorPool.pollAllConnectors();
// This is unnecessary because agents.interfaces.IdleCleanupThread does it.
//ManifoldCF.pollAll(threadContext);
Modified: manifoldcf/branches/CONNECTORS-1119/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1119/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java?rev=1647027&r1=1647026&r2=1647027&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1119/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java (original)
+++ manifoldcf/branches/CONNECTORS-1119/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java Sat Dec 20 18:00:05 2014
@@ -113,6 +113,15 @@ public class ManifoldCF extends org.apac
if (Logging.root != null)
Logging.root.warn("Exception tossed on repository connector pool cleanup: "+e.getMessage(),e);
}
+ try
+ {
+ NotificationConnectorPoolFactory.make(tc).closeAllConnectors();
+ }
+ catch (ManifoldCFException e)
+ {
+ if (Logging.root != null)
+ Logging.root.warn("Exception tossed on notification connector pool cleanup: "+e.getMessage(),e);
+ }
}
/** Create system database using superuser properties from properties.xml.