Repository: nifi Updated Branches: refs/heads/master 1f6805f06 -> 0931c6b0d
NIFI-884 Moving deletion of pid file from beginning of stop() to after a successful stop Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/0931c6b0 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/0931c6b0 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/0931c6b0 Branch: refs/heads/master Commit: 0931c6b0d6f12baf9b7c24b45c9a61c8eca25197 Parents: 1f6805f Author: Bryan Bende <[email protected]> Authored: Fri Aug 21 15:59:29 2015 -0400 Committer: Bryan Bende <[email protected]> Committed: Fri Aug 21 16:40:37 2015 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/nifi/bootstrap/RunNiFi.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/0931c6b0/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 a48a1de..c2f4feb 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 @@ -499,11 +499,6 @@ public class RunNiFi { final Properties nifiProps = loadProperties(logger); final String secretKey = nifiProps.getProperty("secret.key"); - final File statusFile = getStatusFile(logger); - if (statusFile.exists() && !statusFile.delete()) { - logger.error("Failed to delete status file {}; this file should be cleaned up manually", statusFile); - } - try (final Socket socket = new Socket()) { logger.debug("Connecting to NiFi instance"); socket.setSoTimeout(60000); @@ -568,6 +563,10 @@ public class RunNiFi { } } + final File statusFile = getStatusFile(logger); + if (statusFile.exists() && !statusFile.delete()) { + logger.error("Failed to delete status file {}; this file should be cleaned up manually", statusFile); + } logger.info("NiFi has finished shutting down."); } } else {
