Repository: nifi-minifi-cpp Updated Branches: refs/heads/master 4160fb2f9 -> 10eb9757b
MINIFICPP-538 - only print error on actual error during shutdown, update semaphore name This closes #364. Signed-off-by: Marc Parisi <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/10eb9757 Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/10eb9757 Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/10eb9757 Branch: refs/heads/master Commit: 10eb9757b9302646f2020d57668002286fa27887 Parents: 4160fb2 Author: Dustin Rodrigues <[email protected]> Authored: Sun Jun 24 13:30:02 2018 -0400 Committer: Marc Parisi <[email protected]> Committed: Fri Jun 29 06:44:23 2018 -0400 ---------------------------------------------------------------------- main/MiNiFiMain.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/10eb9757/main/MiNiFiMain.cpp ---------------------------------------------------------------------- diff --git a/main/MiNiFiMain.cpp b/main/MiNiFiMain.cpp index 65d79ed..58c71bc 100644 --- a/main/MiNiFiMain.cpp +++ b/main/MiNiFiMain.cpp @@ -71,7 +71,7 @@ int main(int argc, char **argv) { std::string nifi_configuration_class_name = "yamlconfiguration"; std::string content_repo_class = "filesystemrepository"; - running = sem_open("MiNiFiMain", O_CREAT, 0644, 0); + running = sem_open("/MiNiFiMain", O_CREAT, 0644, 0); if (running == SEM_FAILED || running == 0) { logger->log_error("could not initialize semaphore"); @@ -213,10 +213,14 @@ int main(int argc, char **argv) { * yield without the need for a more complex construct and * a spin lock */ - if (sem_wait(running) != -1) + if (sem_wait(running) == -1) perror("sem_wait"); - sem_unlink("MiNiFiMain"); + if (sem_close(running) == -1) + perror("sem_close"); + + if (sem_unlink("/MiNiFiMain") == -1) + perror("sem_unlink"); /** * Trigger unload -- wait stop_wait_time
