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

fix #641 suppress std log messages

Browse source
This commit is contained in:
Shinsuke Sugaya 2016-08-21 22:43:00 +09:00
parent 34082c7e3c
commit d5c10ba767
2 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/assemblies/files/fess
View file

@ -107,10 +107,10 @@ launch_service()
if [ "x$daemonized" = "x" ]; then
fess_parms="$fess_parms -Dfess.foreground=yes"
exec "$JAVA" $JAVA_OPTS $FESS_JAVA_OPTS $fess_parms -Dfess.es.dir="$ES_HOME" -cp "$FESS_CLASSPATH" $props \
org.codelibs.fess.FessBoot $FESS_OPTS
org.codelibs.fess.FessBoot $FESS_OPTS > /dev/null 2>&1
else
exec "$JAVA" $JAVA_OPTS $FESS_JAVA_OPTS $fess_parms -Dfess.es.dir="$ES_HOME" -cp "$FESS_CLASSPATH" $props \
org.codelibs.fess.FessBoot $FESS_OPTS <&- &
org.codelibs.fess.FessBoot $FESS_OPTS <&- > /dev/null 2>&1 &
return $?
fi
}

20
src/main/java/org/codelibs/fess/thumbnail/impl/WebDriverGenerator.java
View file

@ -21,7 +21,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.Collection;
import java.util.logging.Level;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@ -63,8 +62,6 @@ public class WebDriverGenerator extends BaseThumbnailGenerator {
protected String imageFormatName = "png";
protected Level logLevel;
@PostConstruct
public void init() {
if (super.isAvailable()) {
@ -79,17 +76,7 @@ public class WebDriverGenerator extends BaseThumbnailGenerator {
.filter(e -> e.getValue() instanceof String && filePathMap.containsKey(e.getValue().toString()))
.forEach(e -> capabilities.setCapability(e.getKey(), filePathMap.get(e.getValue().toString())));
}
PhantomJSDriver phantomJSDriver =
new PhantomJSDriver(createDriverService(webDriverCapabilities), webDriverCapabilities);
if (logLevel == null) {
if (logger.isDebugEnabled()) {
logLevel = Level.FINE;
} else {
logLevel = Level.OFF;
}
}
phantomJSDriver.setLogLevel(logLevel);
webDriver = phantomJSDriver;
webDriver = new PhantomJSDriver(createDriverService(webDriverCapabilities), webDriverCapabilities);
}
}
webDriver.manage().window().setSize(new Dimension(windowWidth, windowHeight));
@ -250,9 +237,4 @@ public class WebDriverGenerator extends BaseThumbnailGenerator {
public void setThumbnailHeight(int thumbnailHeight) {
this.thumbnailHeight = thumbnailHeight;
}
public void setLogLevel(Level logLevel) {
this.logLevel = logLevel;
}
}