From 39f4e05b81408f5d58009ff3c5fe0f1a111f5035 Mon Sep 17 00:00:00 2001 From: Marcin Siodelski Date: Thu, 29 Jan 2015 19:13:18 +0100 Subject: [PATCH] [3669] Specify the pid file location for kea-lfc in the Memfile backend. --- src/lib/dhcpsrv/memfile_lease_mgr.cc | 9 ++++++++- src/lib/dhcpsrv/memfile_lease_mgr.h | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.cc b/src/lib/dhcpsrv/memfile_lease_mgr.cc index 34a6b2ef8e..0604892a5d 100644 --- a/src/lib/dhcpsrv/memfile_lease_mgr.cc +++ b/src/lib/dhcpsrv/memfile_lease_mgr.cc @@ -442,6 +442,9 @@ Memfile_LeaseMgr::appendSuffix(const std::string& file_name, case FILE_FINISH: name += ".completed"; break; + case FILE_PID: + name += ".pid"; + break; default: // Do not append any suffix for the FILE_CURRENT. ; @@ -554,7 +557,7 @@ Memfile_LeaseMgr::lfcSetup() { // Universe: v4 or v6. args.push_back(lease_file4_ ? "-4" : "-6"); // Previous file. - args.push_back("-p"); + args.push_back("-x"); args.push_back(appendSuffix(lease_file, FILE_PREVIOUS)); // Input file. args.push_back("-i"); @@ -565,6 +568,10 @@ Memfile_LeaseMgr::lfcSetup() { // Finish file. args.push_back("-f"); args.push_back(appendSuffix(lease_file, FILE_FINISH)); + // PID file. + args.push_back("-p"); + args.push_back(appendSuffix(lease_file, FILE_PID)); + // The configuration file is currently unused. args.push_back("-c"); args.push_back("ignored-path"); diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.h b/src/lib/dhcpsrv/memfile_lease_mgr.h index 76b15a677a..b900354767 100644 --- a/src/lib/dhcpsrv/memfile_lease_mgr.h +++ b/src/lib/dhcpsrv/memfile_lease_mgr.h @@ -123,7 +123,8 @@ public: FILE_INPUT, FILE_PREVIOUS, FILE_OUTPUT, - FILE_FINISH + FILE_FINISH, + FILE_PID }; /// @brief The sole lease manager constructor -- 2.47.3