0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #1184 add CrawlerErrors

Browse source
This commit is contained in:
Shinsuke Sugaya 2017-07-26 06:11:48 +09:00
parent 16921afaaf
commit 90a474f47b
3 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/codelibs/fess/Constants.java
View file

@ -195,6 +195,8 @@ public class Constants extends CoreLibConstants {
public static final String CRAWLER_STATUS = "CrawlerStatus";
public static final String CRAWLER_ERRORS = "CrawlerErrors";
public static final String CRAWLER_START_TIME = "CrawlerStartTime";
public static final String CRAWLER_END_TIME = "CrawlerEndTime";

19
src/main/java/org/codelibs/fess/exec/Crawler.java
View file

@ -26,7 +26,10 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@ -67,6 +70,8 @@ public class Crawler {
private static AtomicBoolean running = new AtomicBoolean(false);
private static Queue<String> errors = new ConcurrentLinkedQueue<>();
@Resource
protected FessEsClient fessEsClient;
@ -82,6 +87,12 @@ public class Crawler {
@Resource
protected CrawlingInfoService crawlingInfoService;
public static void addError(final String msg) {
if (StringUtil.isNotBlank(msg)) {
errors.offer(msg);
}
}
public static class Options {
@Option(name = "-s", aliases = "--sessionId", metaVar = "sessionId", usage = "Session ID")
@ -367,7 +378,6 @@ public class Crawler {
final CrawlingInfoHelper crawlingInfoHelper = ComponentUtil.getCrawlingInfoHelper();
boolean completed = false;
try {
writeTimeToSessionInfo(crawlingInfoHelper, Constants.CRAWLER_START_TIME);
@ -423,7 +433,6 @@ public class Crawler {
if (logger.isInfoEnabled()) {
logger.info("Finished Crawler");
}
completed = true;
return Constants.EXIT_OK;
} catch (final Throwable t) {
@ -431,7 +440,11 @@ public class Crawler {
return Constants.EXIT_FAIL;
} finally {
pathMappingHelper.removePathMappingList(options.sessionId);
crawlingInfoHelper.putToInfoMap(Constants.CRAWLER_STATUS, completed ? Constants.T.toString() : Constants.F.toString());
crawlingInfoHelper.putToInfoMap(Constants.CRAWLER_STATUS, errors.isEmpty() ? Constants.T.toString() : Constants.F.toString());
if (!errors.isEmpty()) {
crawlingInfoHelper.putToInfoMap(Constants.CRAWLER_ERRORS, errors.stream().map(s -> s.replace(" ", StringUtil.EMPTY))
.collect(Collectors.joining(" ")));
}
writeTimeToSessionInfo(crawlingInfoHelper, Constants.CRAWLER_END_TIME);
crawlingInfoHelper.putToInfoMap(Constants.CRAWLER_EXEC_TIME, Long.toString(System.currentTimeMillis() - totalTime));

4
src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
View file

@ -272,7 +272,7 @@ public class IndexUpdater extends Thread {
if (fessConfig.getIndexerThreadDumpEnabledAsBoolean()) {
printThreadDump();
}
org.codelibs.fess.exec.Crawler.addError("QueueTimeout");
}
if (!ComponentUtil.available()) {
@ -297,8 +297,10 @@ public class IndexUpdater extends Thread {
logger.error("IndexUpdater is terminated.", t);
} else if (logger.isDebugEnabled()) {
logger.error("IndexUpdater is terminated.", t);
org.codelibs.fess.exec.Crawler.addError(t.getClass().getSimpleName());
} else if (logger.isInfoEnabled()) {
logger.info("IndexUpdater is terminated.");
org.codelibs.fess.exec.Crawler.addError(t.getClass().getSimpleName());
}
forceStop();
} finally {