X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.runtime%2Fsrc%2Forg%2Fargeo%2Fslc%2Fruntime%2Ftasks%2FSystemCall.java;h=07c67c3a1b4dcc814b58ae0b20b1464ea480a6a8;hb=09c9e5093fe1353aaac344ac8a8caf2e1dcc0778;hp=5b9f9dce050f5a682495ab3fd6d6d6fb5f025a3c;hpb=fbde11e8a342318876a4744c4676d3618bdf8583;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/SystemCall.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/SystemCall.java
index 5b9f9dce0..07c67c3a1 100644
--- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/SystemCall.java
+++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/SystemCall.java
@@ -1,5 +1,11 @@
 package org.argeo.slc.runtime.tasks;
 
+import static java.lang.System.Logger.Level.DEBUG;
+import static java.lang.System.Logger.Level.ERROR;
+import static java.lang.System.Logger.Level.INFO;
+import static java.lang.System.Logger.Level.TRACE;
+import static java.lang.System.Logger.Level.WARNING;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
@@ -9,6 +15,7 @@ import java.io.OutputStream;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.io.Writer;
+import java.lang.System.Logger;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -32,19 +39,18 @@ import org.apache.commons.exec.PumpStreamHandler;
 import org.apache.commons.exec.ShutdownHookProcessDestroyer;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.argeo.api.cms.CmsLog;
-import org.argeo.slc.SlcException;
-import org.argeo.slc.UnsupportedException;
-import org.argeo.slc.execution.ExecutionResources;
+import org.argeo.api.slc.SlcException;
+import org.argeo.api.slc.UnsupportedException;
+import org.argeo.api.slc.execution.ExecutionResources;
+import org.argeo.api.slc.test.TestResult;
+import org.argeo.api.slc.test.TestStatus;
 import org.argeo.slc.runtime.test.SimpleResultPart;
-import org.argeo.slc.test.TestResult;
-import org.argeo.slc.test.TestStatus;
 
 /** Execute an OS specific system call. */
 public class SystemCall implements Runnable {
 	public final static String LOG_STDOUT = "System.out";
 
-	private final CmsLog log = CmsLog.getLog(getClass());
+	private final Logger logger = System.getLogger(getClass().getName());
 
 	private String execDir;
 
@@ -172,11 +178,9 @@ public class SystemCall implements Runnable {
 			throw new SlcException("Cannot open a stream for " + stdInFile, e2);
 		}
 
-		if (log.isTraceEnabled()) {
-			log.debug("os.name=" + System.getProperty("os.name"));
-			log.debug("os.arch=" + System.getProperty("os.arch"));
-			log.debug("os.version=" + System.getProperty("os.version"));
-		}
+		logger.log(TRACE, () -> "os.name=" + System.getProperty("os.name"));
+		logger.log(TRACE, () -> "os.arch=" + System.getProperty("os.arch"));
+		logger.log(TRACE, () -> "os.version=" + System.getProperty("os.version"));
 
 		// Execution directory
 		File dir = new File(getExecDirToUse());
@@ -206,7 +210,7 @@ public class SystemCall implements Runnable {
 		// Command line to use
 		final CommandLine commandLine = createCommandLine();
 		if (logCommand)
-			log.info("Execute command:\n" + commandLine + "\n in working directory: \n" + dir + "\n");
+			logger.log(INFO, "Execute command:\n" + commandLine + "\n in working directory: \n" + dir + "\n");
 
 		// Env variables
 		Map<String, String> environmentVariablesToUse = null;
@@ -342,8 +346,8 @@ public class SystemCall implements Runnable {
 			commandLine = new CommandLine(commandToUse.get(0).toString());
 
 			for (int i = 1; i < commandToUse.size(); i++) {
-				if (log.isTraceEnabled())
-					log.debug(commandToUse.get(i));
+				if (logger.isLoggable(TRACE))
+					logger.log(TRACE, commandToUse.get(i));
 				commandLine.addArgument(commandToUse.get(i).toString());
 			}
 		} else {
@@ -437,8 +441,7 @@ public class SystemCall implements Runnable {
 
 			public void onProcessComplete(int exitValue) {
 				String msg = "System call '" + commandLine + "' properly completed.";
-				if (log.isTraceEnabled())
-					log.trace(msg);
+				logger.log(TRACE, () -> msg);
 				if (testResult != null) {
 					forwardPath(testResult);
 					testResult.addResultPart(new SimpleResultPart(TestStatus.PASSED, msg));
@@ -456,7 +459,7 @@ public class SystemCall implements Runnable {
 					if (exceptionOnFailed)
 						throw new SlcException(msg, e);
 					else
-						log.error(msg, e);
+						logger.log(ERROR, msg, e);
 				}
 				releaseWatchdog();
 			}
@@ -503,15 +506,17 @@ public class SystemCall implements Runnable {
 //		}
 
 		if ("ERROR".equals(logLevel))
-			log.error(line);
+			logger.log(ERROR, line);
 		else if ("WARN".equals(logLevel))
-			log.warn(line);
+			logger.log(WARNING, line);
+		else if ("WARNING".equals(logLevel))
+			logger.log(WARNING, line);
 		else if ("INFO".equals(logLevel))
-			log.info(line);
+			logger.log(INFO, line);
 		else if ("DEBUG".equals(logLevel))
-			log.debug(line);
+			logger.log(DEBUG, line);
 		else if ("TRACE".equals(logLevel))
-			log.trace(line);
+			logger.log(TRACE, line);
 		else if (LOG_STDOUT.equals(logLevel))
 			System.out.println(line);
 		else if ("System.err".equals(logLevel))
@@ -525,7 +530,7 @@ public class SystemCall implements Runnable {
 		try {
 			writer.append(line).append('\n');
 		} catch (IOException e) {
-			log.error("Cannot write to log file", e);
+			logger.log(ERROR, "Cannot write to log file", e);
 		}
 	}
 
@@ -541,7 +546,7 @@ public class SystemCall implements Runnable {
 				file = target.toFile();
 			writer = new FileWriter(file, append);
 		} catch (IOException e) {
-			log.error("Cannot get file for " + target, e);
+			logger.log(ERROR, "Cannot get file for " + target, e);
 			IOUtils.closeQuietly(writer);
 		}
 		return writer;
@@ -559,7 +564,7 @@ public class SystemCall implements Runnable {
 				file = target.toFile();
 			out = new FileOutputStream(file, false);
 		} catch (IOException e) {
-			log.error("Cannot get file for " + target, e);
+			logger.log(ERROR, "Cannot get file for " + target, e);
 			IOUtils.closeQuietly(out);
 		}
 		return out;