[50-dhcp-hook-libs-should-not-be-loadable-by-ca-d2] Made Daemon::getProcName() a...

diff --git a/src/bin/dhcp4/main.cc b/src/bin/dhcp4/main.cc
index a6b70ef803ed668772918280663e8c83cadda0d9..0d73914fb4e2c3eef6b94dd2968bd259709bbc8a 100644 (file)
--- a/src/bin/dhcp4/main.cc
+++ b/src/bin/dhcp4/main.cc
@@ -220,7 +220,7 @@ main(int argc, char* argv[]) {
         server.setVerbose(verbose_mode);
 
         // Create our PID file.
-        server.setProcName(DHCP4_NAME);
+       server.setProcName(DHCP4_NAME);
         server.setConfigFile(config_file);
         server.createPIDFile();
 

diff --git a/src/lib/process/daemon.cc b/src/lib/process/daemon.cc
index 273119d66cae14d3d64962d507d576c672b5d908..4ca5d0d4168ae102347e3c206f8999b4093a0891 100644 (file)
--- a/src/lib/process/daemon.cc
+++ b/src/lib/process/daemon.cc
@@ -31,10 +31,12 @@ namespace process {
 
 bool Daemon::verbose_ = false;
 
+std::string Daemon::proc_name_("");
+
 std::string Daemon::default_logger_name_("kea");
 
 Daemon::Daemon()
-    : signal_set_(), signal_handler_(), config_file_(""), proc_name_(""),
+    : signal_set_(), signal_handler_(), config_file_(""),
       pid_file_dir_(DATA_DIR), pid_file_(), am_file_author_(false) {
 
     // The pid_file_dir can be overridden via environment variable
@@ -154,7 +156,7 @@ Daemon::checkConfigFile() const {
 }
 
 std::string
-Daemon::getProcName() const {
+Daemon::getProcName() {
     return (proc_name_);
 };
 

diff --git a/src/lib/process/daemon.h b/src/lib/process/daemon.h
index 91a2412dba37558cb2077e3864078c4a7d89122e..8b8c24d612b6489bb96b6f087942b9e11a87dc26 100644 (file)
--- a/src/lib/process/daemon.h
+++ b/src/lib/process/daemon.h
@@ -174,11 +174,11 @@ public:
     /// @brief returns the process name
     /// This value is used as when forming the default PID file name
     /// @return text string
-    std::string getProcName() const;
+    static std::string getProcName();
 
     /// @brief Sets the process name
     /// @param proc_name name the process by which the process is recognized
-    void setProcName(const std::string& proc_name);
+    static void setProcName(const std::string& proc_name);
 
     /// @brief Returns the directory used when forming default PID file name
     /// @return text string
@@ -265,7 +265,7 @@ private:
     std::string config_file_;
 
     /// @brief Name of this process, used when creating its pid file
-    std::string proc_name_;
+    static std::string proc_name_;
 
     /// @brief Pointer to the directory where PID file(s) are written
     /// It defaults to --localstatedir / run

diff --git a/src/lib/process/tests/daemon_unittest.cc b/src/lib/process/tests/daemon_unittest.cc
index 537cae2c3d0dbecc13390c1a16309eb7604c9d41..b078987c36be0adb32968af87d6bf9f4c86debde 100644 (file)
--- a/src/lib/process/tests/daemon_unittest.cc
+++ b/src/lib/process/tests/daemon_unittest.cc
@@ -91,7 +91,7 @@ TEST_F(DaemonTest, constructor) {
     EXPECT_FALSE(instance2.getVerbose());
 
     EXPECT_TRUE(instance2.getConfigFile().empty());
-    EXPECT_TRUE(instance2.getProcName().empty());
+    EXPECT_EQ("TestBin", instance2.getProcName());
     EXPECT_EQ(std::string(DATA_DIR), instance2.getPIDFileDir());
     EXPECT_TRUE(instance2.getPIDFileName().empty());
 }