Merge pull request #9 from jenkinsci/loggerErrorMethod

Better error logging

Author: sebjulliand

src/main/java/org/jenkinsci/plugins/ibmisteps/model/CallResult.java

@@ -38,8 +38,12 @@ public AS400Message getLastMessage() {
     }
 
     public String getPrettyMessages() {
+        return getPrettyMessages("");
+    }
+
+    public String getPrettyMessages(final String prefix) {
         return messages.stream()
-                .map(m -> MessageFormat.format("[{0}][{1}] {2}", m.getID(), m.getSeverity(), m.getText()))
+                .map(m -> MessageFormat.format("{0}[{1}][{2}] {3}", prefix, m.getID(), m.getSeverity(), m.getText()))
                 .collect(Collectors.joining("\n"));
     }
 

src/main/java/org/jenkinsci/plugins/ibmisteps/model/IBMi.java

@@ -1,13 +1,15 @@
 package org.jenkinsci.plugins.ibmisteps.model;
 
+import com.cloudbees.plugins.credentials.common.StandardUsernamePasswordCredentials;
+import com.ibm.as400.access.*;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import hudson.FilePath;
+import hudson.Util;
+import hudson.util.Secret;
+import org.jenkinsci.plugins.ibmisteps.Messages;
+
 import java.beans.PropertyVetoException;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.io.Serializable;
+import java.io.*;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -16,32 +18,6 @@
 import java.util.UUID;
 import java.util.function.Consumer;
 
-import org.jenkinsci.plugins.ibmisteps.Messages;
-
-import com.cloudbees.plugins.credentials.common.StandardUsernamePasswordCredentials;
-import com.ibm.as400.access.AS400;
-import com.ibm.as400.access.AS400JDBCConnection;
-import com.ibm.as400.access.AS400JDBCDriver;
-import com.ibm.as400.access.AS400JDBCStatement;
-import com.ibm.as400.access.AS400Message;
-import com.ibm.as400.access.AS400SecurityException;
-import com.ibm.as400.access.CharConverter;
-import com.ibm.as400.access.CommandCall;
-import com.ibm.as400.access.ConnectionEvent;
-import com.ibm.as400.access.ConnectionListener;
-import com.ibm.as400.access.ErrorCompletingRequestException;
-import com.ibm.as400.access.IFSFile;
-import com.ibm.as400.access.IFSFileInputStream;
-import com.ibm.as400.access.IFSFileOutputStream;
-import com.ibm.as400.access.Job;
-import com.ibm.as400.access.ObjectDoesNotExistException;
-import com.ibm.as400.access.SecureAS400;
-
-import edu.umd.cs.findbugs.annotations.CheckForNull;
-import hudson.FilePath;
-import hudson.Util;
-import hudson.util.Secret;
-
 public class IBMi implements ConnectionListener, AutoCloseable, Serializable {
 	private static final long serialVersionUID = -3164250407732394897L;
 
@@ -230,7 +206,7 @@ private void closeSQLConnection() {
 			try {
 				sqlConnection.close();
 			} catch (final SQLException e) {
-				logger.log(Messages.IBMi_closeSQL_error(e));
+				logger.error(Messages.IBMi_closeSQL_error(e));
 			} finally {
 				sqlConnection = null;
 				databaseJob = null;

src/main/java/org/jenkinsci/plugins/ibmisteps/model/LoggerWrapper.java

@@ -20,6 +20,14 @@ public synchronized void log(final String message) {
         logger.println("[INFO] " + message);
     }
 
+    public synchronized void error(final String format, final Object... args) {
+        logger.println("[ERROR] " + String.format(format, args));
+    }
+
+    public synchronized void error(final String message) {
+        logger.println("[ERROR] " + message);
+    }
+
     public synchronized void trace(final String format, final Object... args) {
         if (doTrace) {
             logger.println("[TRACE] " + String.format(format, args));

src/main/java/org/jenkinsci/plugins/ibmisteps/steps/IBMiCommandStep.java

@@ -69,10 +69,10 @@ protected CallResult runOnIBMi(final StepContext context, final LoggerWrapper lo
 				error = Messages.IBMICommandStep_failed(command);
 			}
 			if (!failOnError) {
-				logger.log(error);
+				logger.error(error);
 				logger.trace(result.getPrettyMessages());
 			} else {
-				logger.log(result.getPrettyMessages());
+				logger.error(Messages.IBMICommandStep_failed(command) + "\n" + result.getPrettyMessages("\t"));
 				throw new AbortException(error);
 			}
 		}

src/main/java/org/jenkinsci/plugins/ibmisteps/steps/IBMiRunSQLStep.java

@@ -61,7 +61,7 @@ protected SQLResult runOnIBMi(final StepContext context, final LoggerWrapper log
             }
             return result;
         } catch (final SQLException e) {
-            logger.log(Messages.IBMiRunSQLStep_failed(e.getLocalizedMessage()));
+            logger.error(Messages.IBMiRunSQLStep_failed(e.getLocalizedMessage()));
             throw e;
         }
     }