Repository: incubator-slider Updated Branches: refs/heads/develop 9b6deb38e -> 43887868b
SLIDER-1237 Remove usages of printStackTrace Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/43887868 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/43887868 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/43887868 Branch: refs/heads/develop Commit: 43887868be7937086286458fb140a3d856ed2942 Parents: 9b6deb3 Author: Billie Rinaldi <bil...@apache.org> Authored: Tue Aug 22 07:22:12 2017 -0700 Committer: Billie Rinaldi <bil...@apache.org> Committed: Tue Aug 22 07:24:52 2017 -0700 ---------------------------------------------------------------------- .../services/security/CertificateManager.java | 21 ++++---------------- .../server/services/security/SecurityUtils.java | 5 ++--- 2 files changed, 6 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/43887868/slider-core/src/main/java/org/apache/slider/server/services/security/CertificateManager.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/services/security/CertificateManager.java b/slider-core/src/main/java/org/apache/slider/server/services/security/CertificateManager.java index e436ae9..a274e87 100644 --- a/slider-core/src/main/java/org/apache/slider/server/services/security/CertificateManager.java +++ b/slider-core/src/main/java/org/apache/slider/server/services/security/CertificateManager.java @@ -164,9 +164,7 @@ public class CertificateManager { */ private int runCommand(String command) throws SliderException { int exitCode = -1; - String line = null; Process process = null; - BufferedReader br= null; try { process = Runtime.getRuntime().exec(command); StreamConsumer outputConsumer = @@ -185,22 +183,13 @@ public class CertificateManager { throw new SliderException(exitCode, "Error running command %s", command); } } catch (InterruptedException e) { - e.printStackTrace(); + LOG.error("Got interrupted running command " + command, e); } } catch (IOException e) { - e.printStackTrace(); - } finally { - if (br != null) { - try { - br.close(); - } catch (IOException ioe) { - ioe.printStackTrace(); - } - } + LOG.error("Got IOException running command " + command, e); } return exitCode;//some exception occurred - } public synchronized void generateContainerCertificate(String hostname, @@ -414,8 +403,7 @@ public class CertificateManager { try { FileUtils.writeStringToFile(agentCrtReqFile, agentCrtReqContent); } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); + LOG.error("Error writing crt req file", e1); } command = MessageFormat.format(SIGN_AGENT_CRT, scriptArgs); @@ -435,8 +423,7 @@ public class CertificateManager { try { agentCrtContent = FileUtils.readFileToString(agentCrtFile); } catch (IOException e) { - e.printStackTrace(); - LOG.error("Error reading signed agent certificate"); + LOG.error("Error reading signed agent certificate", e); response.setResult(SignCertResponse.ERROR_STATUS); response.setMessage("Error reading signed agent certificate"); return response; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/43887868/slider-core/src/main/java/org/apache/slider/server/services/security/SecurityUtils.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/services/security/SecurityUtils.java b/slider-core/src/main/java/org/apache/slider/server/services/security/SecurityUtils.java index 9d699ab..5fadb46 100644 --- a/slider-core/src/main/java/org/apache/slider/server/services/security/SecurityUtils.java +++ b/slider-core/src/main/java/org/apache/slider/server/services/security/SecurityUtils.java @@ -217,9 +217,8 @@ public class SecurityUtils { passFile.setWritable(true); passFile.setReadable(true); } catch (IOException e) { - e.printStackTrace(); throw new RuntimeException( - "Error creating certificate password file"); + "Error creating certificate password file", e); } } } else { @@ -228,7 +227,7 @@ public class SecurityUtils { password = FileUtils.readFileToString(passFile); password = password.replaceAll("\\p{Cntrl}", ""); } catch (IOException e) { - e.printStackTrace(); + LOG.error("Error reading password from existing file", e); } }
