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 479C717A34 for ; Thu, 29 Jan 2015 12:30:10 +0000 (UTC) Received: (qmail 35229 invoked by uid 500); 29 Jan 2015 12:30:10 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 35183 invoked by uid 500); 29 Jan 2015 12:30:10 -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 35173 invoked by uid 99); 29 Jan 2015 12:30:10 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Jan 2015 12:30:10 +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 B07E6AC005A; Thu, 29 Jan 2015 12:30:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1655618 - /manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java Date: Thu, 29 Jan 2015 12:30:10 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150129123010.B07E6AC005A@hades.apache.org> Author: kwright Date: Thu Jan 29 12:30:10 2015 New Revision: 1655618 URL: http://svn.apache.org/r1655618 Log: First part of CONNECTORS-1154 fix. Modified: manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java Modified: manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java?rev=1655618&r1=1655617&r2=1655618&view=diff ============================================================================== --- manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java (original) +++ manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java Thu Jan 29 12:30:10 2015 @@ -959,7 +959,7 @@ public class ThrottledFetcher { if (statusCode > 0) { - throwable = new ManifoldCFException("Interrupted: "+e.getMessage(),e); + throwable = new ManifoldCFException("Fetch interrupted: "+e.getMessage(),e); statusCode = FETCH_INTERRUPTED; } } @@ -1079,8 +1079,8 @@ public class ThrottledFetcher currentTime + 720L * 60000L,-1,false); } long currentTime = System.currentTimeMillis(); - Logging.connectors.debug("Web: IO exception "+activity+" for '"+myUrl+"', retrying"); - throw new ServiceInterruption("IO exception "+activity+": "+e.getMessage(),e,currentTime+TIME_5MIN,-1L,2,false); + Logging.connectors.debug("Web: IO exception ("+e.getClass().getName()+")"+activity+" for '"+myUrl+"', retrying",e); + throw new ServiceInterruption("IO exception ("+e.getClass().getName()+")"+activity+": "+e.getMessage(),e,currentTime+TIME_5MIN,-1L,2,false); } }