diff --git a/src/main/java/org/codelibs/fess/Constants.java b/src/main/java/org/codelibs/fess/Constants.java index abd23aeaa..6ba34caf3 100644 --- a/src/main/java/org/codelibs/fess/Constants.java +++ b/src/main/java/org/codelibs/fess/Constants.java @@ -383,8 +383,6 @@ public class Constants extends CoreLibConstants { public static final String SEARCH_PREFERENCE_PRIMARY = "_primary"; - public static final String CONFIG_IGNORE_FAILURE_URLS = "ignore.failureUrls"; - public static final String CONFIG_CLEANUP_FILTERS = "cleanup.urlFilters"; public static final String CONFIG_CLEANUP_ALL = "cleanup.all"; diff --git a/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java b/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java index 828b596fc..324936378 100644 --- a/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java +++ b/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java @@ -146,7 +146,7 @@ public class FailureUrlService { final List urlList = new ArrayList<>(); for (final FailureUrl failureUrl : list) { if (pattern != null) { - if (!pattern.matcher(failureUrl.getUrl()).matches()) { + if (!pattern.matcher(failureUrl.getErrorName()).matches()) { urlList.add(failureUrl.getUrl()); } } else { diff --git a/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java b/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java index 6b4c5641c..9a8e04e80 100644 --- a/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java +++ b/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java @@ -227,15 +227,13 @@ public class WebFsIndexHelper { } // failure url - if (!Constants.TRUE.equalsIgnoreCase(configParamMap.get(Constants.CONFIG_IGNORE_FAILURE_URLS))) { - final List excludedUrlList = failureUrlService.getExcludedUrlList(webConfig.getConfigId()); - for (final String u : excludedUrlList) { - if (StringUtil.isNotBlank(u)) { - final String urlValue = u.trim(); - crawler.addExcludeFilter(urlValue); - if (logger.isInfoEnabled()) { - logger.info("Excluded URL from failures: " + urlValue); - } + final List excludedUrlList = failureUrlService.getExcludedUrlList(webConfig.getConfigId()); + for (final String u : excludedUrlList) { + if (StringUtil.isNotBlank(u)) { + final String urlValue = u.trim(); + crawler.addExcludeFilter(urlValue); + if (logger.isInfoEnabled()) { + logger.info("Excluded URL from failures: " + urlValue); } } } @@ -371,16 +369,14 @@ public class WebFsIndexHelper { } // failure url - if (!Constants.TRUE.equalsIgnoreCase(configParamMap.get(Constants.CONFIG_IGNORE_FAILURE_URLS))) { - final List excludedUrlList = failureUrlService.getExcludedUrlList(fileConfig.getConfigId()); - if (excludedUrlList != null) { - for (final String u : excludedUrlList) { - if (StringUtil.isNotBlank(u)) { - final String urlValue = u.trim(); - crawler.addExcludeFilter(urlValue); - if (logger.isInfoEnabled()) { - logger.info("Excluded Path from failures: " + urlValue); - } + final List excludedUrlList = failureUrlService.getExcludedUrlList(fileConfig.getConfigId()); + if (excludedUrlList != null) { + for (final String u : excludedUrlList) { + if (StringUtil.isNotBlank(u)) { + final String urlValue = u.trim(); + crawler.addExcludeFilter(urlValue); + if (logger.isInfoEnabled()) { + logger.info("Excluded Path from failures: " + urlValue); } } }