Shinsuke Sugaya 11 lat temu
rodzic
commit
d57a7ae563
1 zmienionych plików z 9 dodań i 4 usunięć
  1. 9 4
      src/main/java/jp/sf/fess/job/TriggeredJob.java

+ 9 - 4
src/main/java/jp/sf/fess/job/TriggeredJob.java

@@ -78,16 +78,21 @@ public class TriggeredJob implements Job {
             if (logger.isDebugEnabled()) {
             if (logger.isDebugEnabled()) {
                 logger.debug("Starting Job " + jobId + ". scriptType: "
                 logger.debug("Starting Job " + jobId + ". scriptType: "
                         + scriptType + ", script: " + script);
                         + scriptType + ", script: " + script);
-            } else if (logger.isInfoEnabled()) {
+            } else if (scheduledJob.isLoggingEnabled()
+                    && logger.isInfoEnabled()) {
                 logger.info("Starting Job " + jobId + ".");
                 logger.info("Starting Job " + jobId + ".");
             }
             }
 
 
             final Object ret = jobExecutor.execute(script);
             final Object ret = jobExecutor.execute(script);
             if (ret == null) {
             if (ret == null) {
-                logger.info("Finished Job " + jobId + ".");
+                if (scheduledJob.isLoggingEnabled() && logger.isInfoEnabled()) {
+                    logger.info("Finished Job " + jobId + ".");
+                }
             } else {
             } else {
-                logger.info("Finished Job " + jobId
-                        + ". The return value is:\n" + ret);
+                if (scheduledJob.isLoggingEnabled() && logger.isInfoEnabled()) {
+                    logger.info("Finished Job " + jobId
+                            + ". The return value is:\n" + ret);
+                }
                 jobLog.setScriptResult(ret.toString());
                 jobLog.setScriptResult(ret.toString());
             }
             }
             jobLog.setJobStatus(Constants.OK);
             jobLog.setJobStatus(Constants.OK);