diff --git a/jps/jps-builders/src/org/jetbrains/jps/api/GlobalOptions.java b/jps/jps-builders/src/org/jetbrains/jps/api/GlobalOptions.java index 8abbbe054351..269f2ca322cf 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/api/GlobalOptions.java +++ b/jps/jps-builders/src/org/jetbrains/jps/api/GlobalOptions.java @@ -26,7 +26,11 @@ public interface GlobalOptions { String COMPILE_PARALLEL_MAX_THREADS_OPTION = "compile.parallel.max.threads"; String REBUILD_ON_DEPENDENCY_CHANGE_OPTION = "rebuild.on.dependency.change"; String LOG_DIR_OPTION = "jps.log.dir"; - String DISABLE_DEFAULT_FILE_LOGGING_OPTION = "jps.disable.default.file.logging"; + + /** + * Set this property to 'false' to disable default logging. By default the log is written to build.log file in the directory specified by {@link #LOG_DIR_OPTION}. + */ + String USE_DEFAULT_FILE_LOGGING_OPTION = "jps.use.default.file.logging"; // builder ID for all global build messages sent to the controlling IDE String JPS_SYSTEM_BUILDER_ID = "JPS"; diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/LogSetup.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/LogSetup.java index 1356074b6d3a..29e3aa4f1912 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/LogSetup.java +++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/LogSetup.java @@ -18,6 +18,7 @@ package org.jetbrains.jps.cmdline; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.util.SystemProperties; import org.apache.log4j.Level; import org.apache.log4j.PropertyConfigurator; import org.jetbrains.annotations.NonNls; @@ -39,7 +40,7 @@ public class LogSetup { private static final String LOG_FILE_MACRO = "$LOG_FILE_PATH$"; public static void initLoggers() { - if (Boolean.parseBoolean(System.getProperty(GlobalOptions.DISABLE_DEFAULT_FILE_LOGGING_OPTION))) { + if (!SystemProperties.getBooleanProperty(GlobalOptions.USE_DEFAULT_FILE_LOGGING_OPTION, true)) { return; }