[#2101] addressed review comments

diff --git a/ChangeLog b/ChangeLog
index 4aebea4b211622a52000fa0f14d3440cde76b56e..b1f418633065e6ae186c380be6bbc9538522daa5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2315.  [func]          razvan
+       Kea can now load hook libraries specifying only the binary name.
+       It uses the default hook libraries installation path which is
+       provided in the config report as "Hooks directory".
+       (Gitlab #2101, #3579)
+
 2314.  [func]          tmark
        Added three new parameters which may be used to
        influence DNS TTL to kea-dhcp4 and kea-dhcp6:

diff --git a/doc/sphinx/arm/hooks.rst b/doc/sphinx/arm/hooks.rst
index 1bd1bc4623075d23fdc4389be5d8ab14cd934f32..728a38acc657ddc372816a6c33c4f9e47f9a2498 100644 (file)
--- a/doc/sphinx/arm/hooks.rst
+++ b/doc/sphinx/arm/hooks.rst
@@ -213,8 +213,10 @@ configuration would be:
    because the parameters specified for the library (or the files those
    parameters point to) may have changed.
 
-Since Kea-2.7.5, the server is able to load hooks specified only by name, if
-they reside in the default install location (the path is OS specific).
+Since Kea-2.7.6, the server is able to load hook libraries specifying only the binary name,
+if they reside in the default installation directory (the path is OS specific).
+The default hook libraries installation path is provided in the config report as
+"Hooks directory".
 
 ::
 

diff --git a/src/lib/hooks/hooks_parser.h b/src/lib/hooks/hooks_parser.h
index 0fea1fe26b340ef373889f64e112e5c46eddc429..8815d8497d7467d88128caecf810481e324c0734 100644 (file)
--- a/src/lib/hooks/hooks_parser.h
+++ b/src/lib/hooks/hooks_parser.h
@@ -58,8 +58,8 @@ public:
     /// @param value pointer to the content to be parsed
     void parse(HooksConfig& libraries, isc::data::ConstElementPtr value);
 
-    /// @brief The default installation path for hooks, used to generate full
-    /// path if only the hook name is provided.
+    /// @brief The default installation path for hook libraries, used to generate
+    /// full path if only the hook library binary name is provided.
     static std::string default_hooks_path_;
 };
 

diff --git a/src/lib/process/cfgrpt/tests/config_report_unittests.cc b/src/lib/process/cfgrpt/tests/config_report_unittests.cc
index a783f3d196f23c7c6f7a89c6d9880c255db3dcd6..cc756ce6f0f1211a79fdc641b23731fa9bdf052c 100644 (file)
--- a/src/lib/process/cfgrpt/tests/config_report_unittests.cc
+++ b/src/lib/process/cfgrpt/tests/config_report_unittests.cc
@@ -27,5 +27,6 @@ TEST(ConfigReportTest, getConfigReport) {
     ASSERT_FALSE(cfgReport.empty());
     EXPECT_NE(std::string::npos, cfgReport.find(VERSION));
     EXPECT_NE(std::string::npos, cfgReport.find(EXTENDED_VERSION));
-    EXPECT_NE(std::string::npos, cfgReport.find(HooksLibrariesParser::default_hooks_path_));
+    EXPECT_NE(std::string::npos, cfgReport.find(std::string("Hooks directory:   ") +
+                                                HooksLibrariesParser::default_hooks_path_));
 }