fix #1500 improve log messages

This commit is contained in:
Shinsuke Sugaya 2018-02-13 06:29:23 +09:00
parent 354e65d6e1
commit 2815bc49be
5 changed files with 68 additions and 9 deletions

View file

@ -133,7 +133,13 @@ public class ThumbnailGenerator {
TimeoutManager.getInstance().addTimeoutTarget(new SystemMonitorTarget(),
ComponentUtil.getFessConfig().getSuggestSystemMonitorIntervalAsInteger(), true);
exitCode = process(options);
int totalCount = process(options);
if (totalCount != 0) {
logger.info("Created " + totalCount + " thumbnail files.");
} else {
logger.info("No new thumbnails found.");
}
exitCode = 0;
} catch (final ContainerNotAvailableException e) {
if (logger.isDebugEnabled()) {
logger.debug("ThumbnailGenerator is stopped.", e);
@ -151,7 +157,6 @@ public class ThumbnailGenerator {
destroyContainer();
}
logger.info("Finished ThumbnailGenerator.");
System.exit(exitCode);
}
@ -185,7 +190,6 @@ public class ThumbnailGenerator {
count = ComponentUtil.getThumbnailManager().generate();
totalCount += count;
}
logger.info("Created " + totalCount + " thumbnail files.");
return 0;
return totalCount;
}
}

View file

@ -211,9 +211,7 @@ public class GenerateThumbnailJob {
}
cmdList.add("-Dfess.log.path=" + logFilePath);
addSystemProperty(cmdList, "fess.log.name", "fess-thumbnail", "-thumbnail");
if (logLevel == null) {
addSystemProperty(cmdList, "fess.log.level", null, null);
} else {
if (logLevel != null) {
cmdList.add("-Dfess.log.level=" + logLevel);
}
stream(fessConfig.getJvmSuggestOptionsAsArray()).of(

View file

@ -295,7 +295,9 @@ public class ThumbnailManager {
}
public void add(final ThumbnailGenerator generator) {
logger.info(generator.getName() + " is available.");
if (logger.isDebugEnabled()) {
logger.debug(generator.getName() + " is available.");
}
if (generator.isAvailable()) {
generatorList.add(generator);
}

View file

@ -9,7 +9,7 @@
{"index":{"_index":".fess_config","_type":"scheduled_job","_id":"doc_purger"}}
{"name":"Doc Purger","target":"all","cronExpression":"* * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"purgeDocJob\").execute();","jobLogging":false,"crawler":false,"available":true,"sortOrder":5,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
{"index":{"_index":".fess_config","_type":"scheduled_job","_id":"thumbnail_generate"}}
{"name":"Thumbnail Generator","target":"all","cronExpression":"* * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"generateThumbnailJob\").logLevel(\"info\").execute();","jobLogging":false,"crawler":false,"available":true,"sortOrder":6,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
{"name":"Thumbnail Generator","target":"all","cronExpression":"* * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"generateThumbnailJob\").execute();","jobLogging":false,"crawler":false,"available":true,"sortOrder":6,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
{"index":{"_index":".fess_config","_type":"scheduled_job","_id":"thumbnail_purger"}}
{"name":"Thumbnail Purger","target":"all","cronExpression":"0 0 * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"purgeThumbnailJob\").expiry(30 * 24 * 60 * 60 * 1000L).execute();","jobLogging":true,"crawler":false,"available":true,"sortOrder":7,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
{"index":{"_index":".fess_config","_type":"scheduled_job","_id":"reload_config"}}

View file

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="WARN">
<Properties>
<Property name="domain.name" value="${sys:fess.log.name:-fess}" />
<Property name="log.level" value="${sys:fess.log.level:-info}" />
<Property name="root.log.level" value="${sys:fess.log.level:-warn}" />
<Property name="log.pattern" value="%d [%t] %-5p %msg%n" />
<Property name="log.file.basedir" value="${sys:fess.log.path:-target/logs}" />
<Property name="backup.date.suffix" value="_%d{yyyyMMdd}" />
<Property name="backup.max.history" value="90" />
<Property name="audit.log.pattern" value="%msg%n" />
</Properties>
<Appenders>
<Routing name="Console">
<Script name="RoutingInit" language="JavaScript"><![CDATA[
java.lang.System.getProperty("lasta.env") == null ? "Output" : "NoOutput";]]>
</Script>
<Routes>
<Route key="Output">
<Console name="OutputConsole" target="SYSTEM_OUT">
<PatternLayout pattern="${log.pattern}" />
</Console>
</Route>
<Route key="NoOutput">
<CountingNoOp name="DevNull" />
</Route>
</Routes>
</Routing>
<RollingFile name="AppFile" fileName="${log.file.basedir}/${domain.name}.log"
filePattern="${log.file.basedir}/${domain.name}${backup.date.suffix}-%i.log.gz">
<PatternLayout>
<Pattern>${log.pattern}</Pattern>
</PatternLayout>
<Policies>
<TimeBasedTriggeringPolicy />
<SizeBasedTriggeringPolicy size="100 MB" />
</Policies>
<DefaultRolloverStrategy fileIndex="max" min="1"
max="${backup.max.history}" compressionLevel="9" />
</RollingFile>
</Appenders>
<Loggers>
<Logger name="org.codelibs.fess" additivity="false" level="${log.level}">
<AppenderRef ref="Console" />
<AppenderRef ref="AppFile" />
</Logger>
<Root level="${root.log.level}">
<AppenderRef ref="Console" />
<AppenderRef ref="AppFile" />
</Root>
</Loggers>
</Configuration>