소스 검색

fix #486 : ignore error

Shinsuke Sugaya 9 년 전
부모
커밋
03cbf858ef
2개의 변경된 파일6개의 추가작업 그리고 8개의 파일을 삭제
  1. 3 4
      src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java
  2. 3 4
      src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java

+ 3 - 4
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) {

+ 3 - 4
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) {