2
0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 21:45:37 +00:00

[#103,!277] Addressed minor review comments.

This commit is contained in:
Marcin Siodelski
2019-03-25 18:35:25 +01:00
parent e8ac74f355
commit efd70f451d
4 changed files with 10 additions and 10 deletions

View File

@@ -26,8 +26,8 @@ namespace dhcp {
class CBControlDHCPv4 : public CBControlDHCP<ConfigBackendDHCPv4Mgr> {
protected:
/// @brief DHCPv4 server specific method to apply fetch configuration
/// into the local configuration.
/// @brief DHCPv4 server specific method to fetch and apply back end
/// configuration into the local configuration.
///
/// @param backend_selector Backend selector.
/// @param server_selector Server selector.

View File

@@ -31,8 +31,8 @@ namespace process {
/// has to be merged.
///
/// When the server starts up, the existing configuration is the one that
/// the server read from the configuration file. Usually, the configuration
/// fetched from the file will be disjoint with the configuration in the
/// the server reads from the configuration file. Usually, the configuration
/// fetched from the file will be disjointed with the configuration in the
/// database, e.g. all subnets should be specified either in the configuration
/// file or a database, not in both. However, there may be other cases when
/// option definitions are held in the configuration file, but the DHCP
@@ -43,7 +43,7 @@ namespace process {
/// database. Finally, both configurations should be merged and committed
/// if they are deemed sane.
///
/// When the server is already running it uses "audit" (a.k.a. journal)
/// When the server is already running it may use "audit" (a.k.a. journal)
/// to periodically check if there are any pending configuration updates.
/// If changes are present, it will be fetched and used to create a new
/// configuration object (derived from the @c ConfigBase) holding this
@@ -63,7 +63,7 @@ namespace process {
/// databases via the configuration backends,
/// - fetch the audit trail to detect configuration updates,
/// - store the timestamp of the most recent audit entry fetched from the
/// database, so as next time it can only fetch the later updates.
/// database, so as next time it can fetch only the later updates.
///
/// The server specific part to be implemented in derived classes must
/// correctly interpret the audit entries and make appropriate API calls
@@ -260,8 +260,8 @@ protected:
return (true);
}
/// @brief Server specific method to apply fetched configuration into
/// the local configuration.
/// @brief Server specific method to fetch and apply back end
/// configuration into the local configuration.
///
/// This pure virtual method must be implemented in the derived classes
/// to provide server specific implementation of fetching and applying

View File

@@ -50,7 +50,7 @@ configuration is committed by the administrator. Additional information
may be provided.
% DCTL_CONFIG_FETCH Fetching configuration data from config backends.
This is an informational message emitted when the Kea server about to begin
This is an informational message emitted when the Kea server is about to begin
retrieving configuration data from one or more configuration backends.
% DCTL_CONFIG_FILE_LOAD_FAIL %1 reason: %2

View File

@@ -387,7 +387,7 @@ public:
std::map<std::string, boost::posix_time::ptime> timestamps_;
};
// This test verifies that the correct instance of the Config
// This test verifies that the same instance of the Config
// Backend Manager is returned.
TEST_F(CBControlBaseTest, getMgr) {
auto mgr = cb_ctl_.getMgr();