NIFI-1059 Amending patch to fix identified logging output defect
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/0609a84f Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/0609a84f Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/0609a84f Branch: refs/heads/master Commit: 0609a84fa2b84085cea48cfb60095fd75a3bf07a Parents: 757202b Author: joewitt <[email protected]> Authored: Thu Nov 26 01:10:11 2015 -0500 Committer: joewitt <[email protected]> Committed: Thu Nov 26 09:28:50 2015 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/nifi/bootstrap/RunNiFi.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/0609a84f/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java ---------------------------------------------------------------------- diff --git a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java index a3d3de7..098be03 100644 --- a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java +++ b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java @@ -705,9 +705,9 @@ public class RunNiFi { } catch (final IOException ioe) { if (pid == null) { logger.error("Failed to send shutdown command to port {} due to {}. No PID found for the NiFi process, so unable to kill process; " - + "the process should be killed manually.", new Object[] {port, ioe.toString(), ioe}); + + "the process should be killed manually.", new Object[] {port, ioe.toString()}); } else { - logger.error("Failed to send shutdown command to port {} due to {}. Will kill the NiFi Process with PID {}.", new Object[] {port, ioe.toString(), ioe, pid}); + logger.error("Failed to send shutdown command to port {} due to {}. Will kill the NiFi Process with PID {}.", new Object[] {port, ioe.toString(), pid}); killProcessTree(pid, logger); } } finally {
