From 03cbf858efa92f9c5a517d648d91b90d68d6095c Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 21 Apr 2016 08:35:22 +0900 Subject: [PATCH] fix #486 : ignore error --- .../java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java | 7 +++---- .../java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java b/src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java index fa28216dd..324c661db 100644 --- a/src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java +++ b/src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java @@ -266,12 +266,11 @@ public class CsvDataStoreImpl extends AbstractDataStoreImpl { } final FailureUrlService failureUrlService = ComponentUtil.getComponent(FailureUrlService.class); failureUrlService.store(dataConfig, errorName, url, target); - } catch (final Exception | OutOfMemoryError e) { + } catch (final Throwable t) { + logger.warn("Crawling Access Exception at : " + dataMap, t); final String url = csvFile.getAbsolutePath() + ":" + csvReader.getLineNumber(); final FailureUrlService failureUrlService = ComponentUtil.getComponent(FailureUrlService.class); - failureUrlService.store(dataConfig, e.getClass().getCanonicalName(), url, e); - - logger.warn("Crawling Access Exception at : " + dataMap, e); + failureUrlService.store(dataConfig, t.getClass().getCanonicalName(), url, t); } if (readInterval > 0) { diff --git a/src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java b/src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java index 5e4fa5933..46de8377b 100644 --- a/src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java +++ b/src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java @@ -210,12 +210,11 @@ public class EsDataStoreImpl extends AbstractDataStoreImpl { } final FailureUrlService failureUrlService = ComponentUtil.getComponent(FailureUrlService.class); failureUrlService.store(dataConfig, errorName, url, target); - } catch (final Exception e) { + } catch (final Throwable t) { + logger.warn("Crawling Access Exception at : " + dataMap, t); final String url = hit.getIndex() + "/" + hit.getType() + "/" + hit.getId(); final FailureUrlService failureUrlService = ComponentUtil.getComponent(FailureUrlService.class); - failureUrlService.store(dataConfig, e.getClass().getCanonicalName(), url, e); - - logger.warn("Crawling Access Exception at : " + dataMap, e); + failureUrlService.store(dataConfig, t.getClass().getCanonicalName(), url, t); } if (bulkRequest != null) {