Browse Source

[3669] Specify the pid file location for kea-lfc in the Memfile backend.

Marcin Siodelski 10 years ago
parent
commit
39f4e05b81
2 changed files with 10 additions and 2 deletions
  1. 8 1
      src/lib/dhcpsrv/memfile_lease_mgr.cc
  2. 2 1
      src/lib/dhcpsrv/memfile_lease_mgr.h

+ 8 - 1
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");

+ 2 - 1
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