Return-Path: X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1D7389E4D for ; Sat, 20 Dec 2014 18:00:14 +0000 (UTC) Received: (qmail 57911 invoked by uid 500); 20 Dec 2014 18:00:14 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 57878 invoked by uid 500); 20 Dec 2014 18:00:13 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 57863 invoked by uid 99); 20 Dec 2014 18:00:13 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Dec 2014 18:00:13 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id BFA6BAC08A8; Sat, 20 Dec 2014 18:00:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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... Date: Sat, 20 Dec 2014 18:00:05 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141220180011.BFA6BAC08A8@hades.apache.org> 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.