Pass exception to log4j Logger

Author: jschroeder-avi

src/main/java/com/codedx/plugins/bamboo/CodeDxScanTask.java

@@ -204,7 +204,7 @@ private static Boolean collectFilesToUpload(ScanTaskState state) {
         try {
             state.filesToUpload.add(Archiver.archive(state.taskContext.getRootDirectory(), state.includePaths, state.excludePaths, "files_to_scan"));
         } catch (IOException e) {
-            logError(state, "An error occurred while trying to archive source files: %s", e.toString());
+            logError(state, e, "An error occurred while trying to archive source files");
             return false;
         }
 
@@ -249,7 +249,7 @@ private static Boolean uploadFiles(ScanTaskState state) {
             logApiException(state, e);
             return false;
         } catch (IOException e) {
-            logError(state, "An error occurred while trying to archive source files: %s", e.toString());
+            logError(state, e, "An error occurred while trying to archive source files");
             return false;
         }
 
@@ -265,7 +265,7 @@ private static Boolean waitForCodeDxToBeReadyForAnalysis(ScanTaskState state) {
             try {
                 Thread.sleep(1000); // Consider adding maximum wait time
             } catch (InterruptedException e) {
-                logError(state, "An unexpected threading issue occurred.  This could occur if the build is manually cancelled.  Exception: %s", e.toString());
+                logError(state, e, "An unexpected threading issue occurred.  This could occur if the build is manually cancelled.");
                 return false;
             }
 
@@ -354,7 +354,7 @@ private static Boolean waitForAnalysisToFinish(ScanTaskState state) {
             try {
                 Thread.sleep(5000); // Consider adding maximum wait time
             } catch (InterruptedException e) {
-                logError(state, "An unexpected threading issue occurred.  This could occur if the build is manually cancelled.  Exception: %s", e.toString());
+                logError(state, e, "An unexpected threading issue occurred.  This could occur if the build is manually cancelled.");
                 return false;
             }
 
@@ -468,13 +468,19 @@ private static void log(ScanTaskState state, String format, Object... args) {
         _logger.info(message);
     }
 
+    private static void logError(ScanTaskState state, Exception e, String format, Object... args) {
+        String errorMessage = String.format(format, args);
+        state.buildLogger.addErrorLogEntry(String.format("%s || Exception - %s", errorMessage, e.toString()));
+        _logger.error(errorMessage, e);
+    }
+
     private static void logError(ScanTaskState state, String format, Object... args) {
-        String error = String.format(format, args);
-        state.buildLogger.addErrorLogEntry(error);
-        _logger.error(error);
+        String errorMessage = String.format(format, args);
+        state.buildLogger.addErrorLogEntry(errorMessage);
+        _logger.error(errorMessage);
     }
 
     private static void logApiException(ScanTaskState state, Exception e) {
-        logError(state, "An error occurred while trying to communicate with Code Dx's API: %s", e.toString());
+        logError(state, e, "An error occurred while trying to communicate with Code Dx's API");
     }
 }

src/main/java/com/codedx/plugins/bamboo/CodeDxScanTaskConfigurator.java

@@ -173,14 +173,12 @@ private static List<Project> getProjectList(Map<String, Object> context) {
             return projectsApi.getProjects().getProjects();
 
         } catch (IllegalArgumentException e) {
-            e.printStackTrace();
-            _logger.error(e.toString());
+            _logger.error(e);
         } catch (ApiException e) {
-            e.printStackTrace();
-            _logger.error(e.toString());
+            _logger.error(e);
         } catch (ProcessingException e) {
             context.put("reachabilityMessage", "Connection refused. Please confirm that the URL is correct and that the Code Dx server is running.");
-            _logger.error(e.toString());
+            _logger.error(e);
         }
 
         return new ArrayList<Project>();

src/main/java/com/codedx/plugins/bamboo/ProjectRefresherServlet.java

@@ -82,7 +82,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
             projects = projectsApi.getProjects();
         } catch (ApiException e) {
 
-            _logger.error(e.toString());
+            _logger.error(e);
 
             // Bad API Token?
             int responseCode = e.getCode();
@@ -109,7 +109,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
             _logger.error("Error message to send to client: " + message);
             return;
         } catch (ProcessingException e) {
-            _logger.error(e.toString());
+            _logger.error(e);
             resp.setStatus(404);
             resp.getOutputStream().print("Connection refused. Please confirm that the URL is correct and that the Code Dx server is running.");
             return;

src/main/java/com/codedx/plugins/bamboo/ServerConfigManager.java

@@ -104,8 +104,7 @@ public static ApiClient getConfiguredClient(String url, String apiKey, String fi
                         .build();
                 cdxApiClient.setHttpClient(client);
             } catch (Exception e) {
-                _logger.error(e.toString());
-                e.printStackTrace();
+                _logger.error(e);
             }
         }
         return cdxApiClient;

src/main/java/com/codedx/plugins/bamboo/security/FingerprintStrategy.java

@@ -37,8 +37,7 @@ public CertificateAcceptance checkAcceptance(Certificate genericCert, Certificat
 					return CertificateAcceptance.ACCEPT_PERMANENTLY;
 				}
 			} catch (CertificateEncodingException exception) {
-				_logger.error("Problem reading certificate: " + exception);
-				exception.printStackTrace();
+				_logger.error("Problem reading certificate", exception);
 			}
 		} else {
 			_logger.error("Certificate presented was not X509: " + genericCert);