From 7cd39b92e97a580da26ec91e50de172399b08bce Mon Sep 17 00:00:00 2001 From: Razvan Becheriu Date: Wed, 2 Oct 2024 16:59:44 +0300 Subject: [PATCH] [#3536] moved log messages and loggers --- src/hooks/dhcp/mysql/mysql_hb_log.cc | 7 + src/hooks/dhcp/mysql/mysql_hb_log.h | 37 ++ src/hooks/dhcp/mysql/mysql_hb_messages.cc | 16 +- src/hooks/dhcp/mysql/mysql_hb_messages.h | 9 +- src/hooks/dhcp/mysql/mysql_hb_messages.mes | 33 ++ .../dhcp/mysql/mysql_host_data_source.cc | 16 +- src/hooks/dhcp/mysql/mysql_lb_log.cc | 7 + src/hooks/dhcp/mysql/mysql_lb_log.h | 37 ++ src/hooks/dhcp/mysql/mysql_lb_messages.cc | 98 ++- src/hooks/dhcp/mysql/mysql_lb_messages.h | 50 +- src/hooks/dhcp/mysql/mysql_lb_messages.mes | 260 ++++++++ src/hooks/dhcp/mysql/mysql_lease_mgr.cc | 119 ++-- src/hooks/dhcp/pgsql/pgsql_hb_log.cc | 7 + src/hooks/dhcp/pgsql/pgsql_hb_log.h | 37 ++ src/hooks/dhcp/pgsql/pgsql_hb_messages.cc | 16 +- src/hooks/dhcp/pgsql/pgsql_hb_messages.h | 9 +- src/hooks/dhcp/pgsql/pgsql_hb_messages.mes | 35 ++ .../dhcp/pgsql/pgsql_host_data_source.cc | 14 +- src/hooks/dhcp/pgsql/pgsql_lb_log.cc | 7 + src/hooks/dhcp/pgsql/pgsql_lb_log.h | 37 ++ src/hooks/dhcp/pgsql/pgsql_lb_messages.cc | 96 ++- src/hooks/dhcp/pgsql/pgsql_lb_messages.h | 49 +- src/hooks/dhcp/pgsql/pgsql_lb_messages.mes | 256 ++++++++ src/hooks/dhcp/pgsql/pgsql_lease_mgr.cc | 115 ++-- src/lib/dhcpsrv/dhcpsrv_messages.cc | 212 +------ src/lib/dhcpsrv/dhcpsrv_messages.h | 106 +--- src/lib/dhcpsrv/dhcpsrv_messages.mes | 556 +----------------- src/lib/dhcpsrv/memfile_lease_mgr.cc | 4 +- 28 files changed, 1243 insertions(+), 1002 deletions(-) diff --git a/src/hooks/dhcp/mysql/mysql_hb_log.cc b/src/hooks/dhcp/mysql/mysql_hb_log.cc index b10bf3d265..8cca192ce1 100644 --- a/src/hooks/dhcp/mysql/mysql_hb_log.cc +++ b/src/hooks/dhcp/mysql/mysql_hb_log.cc @@ -11,6 +11,13 @@ namespace isc { namespace dhcp { +extern const int MYSQL_HB_DBG_TRACE = isc::log::DBGLVL_TRACE_BASIC; +extern const int MYSQL_HB_DBG_RESULTS = isc::log::DBGLVL_TRACE_BASIC_DATA; +extern const int MYSQL_HB_DBG_TRACE_DETAIL = isc::log::DBGLVL_TRACE_DETAIL; +extern const int MYSQL_HB_DBG_TRACE_DETAIL_DATA = + isc::log::DBGLVL_TRACE_DETAIL_DATA; +extern const int MYSQL_HB_DBG_HOOKS = isc::log::DBGLVL_TRACE_BASIC; + isc::log::Logger mysql_hb_logger("mysql-hb-hooks"); } // namespace dhcp diff --git a/src/hooks/dhcp/mysql/mysql_hb_log.h b/src/hooks/dhcp/mysql/mysql_hb_log.h index 904d5fe6b9..83f2be01bc 100644 --- a/src/hooks/dhcp/mysql/mysql_hb_log.h +++ b/src/hooks/dhcp/mysql/mysql_hb_log.h @@ -14,6 +14,43 @@ namespace isc { namespace dhcp { +///@{ +/// @brief MySQL Host Mgr logging levels +/// +/// Defines the levels used to output debug messages in the MySQL Lease Mgr +/// Note that higher numbers equate to more verbose (and detailed) output. + +/// @brief Traces normal operations +/// +/// E.g. sending a query to the database etc. +extern const int MYSQL_HB_DBG_TRACE; + +/// @brief Records the results of the lookups +/// +/// Using the example of tracing queries from the backend database, this will +/// just record the summary results. +extern const int MYSQL_HB_DBG_RESULTS; + +/// @brief Additional information +/// +/// Record detailed tracing. This is generally reserved for tracing access to +/// the lease database. +extern const int MYSQL_HB_DBG_TRACE_DETAIL; + +/// @brief Additional information +/// +/// Record detailed (and verbose) data on the server. +extern const int MYSQL_HB_DBG_TRACE_DETAIL_DATA; + +// Trace hook related operations +extern const int MYSQL_HB_DBG_HOOKS; +///@} + +/// @brief MySQL Host Mgr Logger +/// +/// Define the logger used to log messages. We could define it in multiple +/// modules, but defining in a single module and linking to it saves time and +/// space. extern isc::log::Logger mysql_hb_logger; } // namespace dhcp diff --git a/src/hooks/dhcp/mysql/mysql_hb_messages.cc b/src/hooks/dhcp/mysql/mysql_hb_messages.cc index 196222c1c9..9c75a467a2 100644 --- a/src/hooks/dhcp/mysql/mysql_hb_messages.cc +++ b/src/hooks/dhcp/mysql/mysql_hb_messages.cc @@ -1,4 +1,4 @@ -// File created from ../../../../src/hooks/dhcp/mysql_hb/mysql_hb_messages.mes +// File created from ../../../../src/hooks/dhcp/mysql/mysql_hb_messages.mes #include #include @@ -8,8 +8,15 @@ namespace isc { namespace dhcp { extern const isc::log::MessageID MYSQL_HB_DB = "MYSQL_HB_DB"; +extern const isc::log::MessageID MYSQL_HB_DB_GET_VERSION = "MYSQL_HB_DB_GET_VERSION"; +extern const isc::log::MessageID MYSQL_HB_DB_READONLY = "MYSQL_HB_DB_READONLY"; +extern const isc::log::MessageID MYSQL_HB_DB_RECONNECT_ATTEMPT_FAILED = "MYSQL_HB_DB_RECONNECT_ATTEMPT_FAILED"; +extern const isc::log::MessageID MYSQL_HB_DB_RECONNECT_ATTEMPT_SCHEDULE = "MYSQL_HB_DB_RECONNECT_ATTEMPT_SCHEDULE"; +extern const isc::log::MessageID MYSQL_HB_DB_RECONNECT_FAILED = "MYSQL_HB_DB_RECONNECT_FAILED"; extern const isc::log::MessageID MYSQL_HB_DEINIT_OK = "MYSQL_HB_DEINIT_OK"; extern const isc::log::MessageID MYSQL_HB_INIT_OK = "MYSQL_HB_INIT_OK"; +extern const isc::log::MessageID MYSQL_HB_NO_TLS = "MYSQL_HB_NO_TLS"; +extern const isc::log::MessageID MYSQL_HB_TLS_CIPHER = "MYSQL_HB_TLS_CIPHER"; } // namespace dhcp } // namespace isc @@ -18,8 +25,15 @@ namespace { const char* values[] = { "MYSQL_HB_DB", "opening MySQL hosts database: %1", + "MYSQL_HB_DB_GET_VERSION", "obtaining schema version information for the MySQL hosts database", + "MYSQL_HB_DB_READONLY", "MySQL host database opened for read access only", + "MYSQL_HB_DB_RECONNECT_ATTEMPT_FAILED", "database reconnect failed: %1", + "MYSQL_HB_DB_RECONNECT_ATTEMPT_SCHEDULE", "scheduling attempt %1 of %2 in %3 milliseconds", + "MYSQL_HB_DB_RECONNECT_FAILED", "maximum number of database reconnect attempts: %1, has been exhausted without success", "MYSQL_HB_DEINIT_OK", "unloading MySQL HB hooks library successful", "MYSQL_HB_INIT_OK", "loading MySQL HB hooks library successful", + "MYSQL_HB_NO_TLS", "TLS was required but is not used", + "MYSQL_HB_TLS_CIPHER", "TLS cipher: %1", NULL }; diff --git a/src/hooks/dhcp/mysql/mysql_hb_messages.h b/src/hooks/dhcp/mysql/mysql_hb_messages.h index ffe420bca2..9a088763cc 100644 --- a/src/hooks/dhcp/mysql/mysql_hb_messages.h +++ b/src/hooks/dhcp/mysql/mysql_hb_messages.h @@ -1,4 +1,4 @@ -// File created from ../../../../src/hooks/dhcp/mysql_hb/mysql_hb_messages.mes +// File created from ../../../../src/hooks/dhcp/mysql/mysql_hb_messages.mes #ifndef MYSQL_HB_MESSAGES_H #define MYSQL_HB_MESSAGES_H @@ -9,8 +9,15 @@ namespace isc { namespace dhcp { extern const isc::log::MessageID MYSQL_HB_DB; +extern const isc::log::MessageID MYSQL_HB_DB_GET_VERSION; +extern const isc::log::MessageID MYSQL_HB_DB_READONLY; +extern const isc::log::MessageID MYSQL_HB_DB_RECONNECT_ATTEMPT_FAILED; +extern const isc::log::MessageID MYSQL_HB_DB_RECONNECT_ATTEMPT_SCHEDULE; +extern const isc::log::MessageID MYSQL_HB_DB_RECONNECT_FAILED; extern const isc::log::MessageID MYSQL_HB_DEINIT_OK; extern const isc::log::MessageID MYSQL_HB_INIT_OK; +extern const isc::log::MessageID MYSQL_HB_NO_TLS; +extern const isc::log::MessageID MYSQL_HB_TLS_CIPHER; } // namespace dhcp } // namespace isc diff --git a/src/hooks/dhcp/mysql/mysql_hb_messages.mes b/src/hooks/dhcp/mysql/mysql_hb_messages.mes index 21b703a232..884fc31662 100644 --- a/src/hooks/dhcp/mysql/mysql_hb_messages.mes +++ b/src/hooks/dhcp/mysql/mysql_hb_messages.mes @@ -20,3 +20,36 @@ library has been unloaded successfully. % MYSQL_HB_INIT_OK loading MySQL HB hooks library successful This informational message indicates that the MySQL Host Backend hooks library has been loaded successfully. Enjoy! + +% MYSQL_HB_DB_GET_VERSION obtaining schema version information for the MySQL hosts database +Logged at debug log level 50. +A debug message issued when the server is about to obtain schema version +information from the MySQL hosts database. + +% MYSQL_HB_DB_READONLY MySQL host database opened for read access only +This informational message is issued when the user has configured the MySQL +database in read-only mode. Kea will not be able to insert or modify +host reservations but will be able to retrieve existing ones and +assign them to the clients communicating with the server. + +% MYSQL_HB_DB_RECONNECT_ATTEMPT_FAILED database reconnect failed: %1 +An error message issued when an attempt to reconnect has failed. + +% MYSQL_HB_DB_RECONNECT_ATTEMPT_SCHEDULE scheduling attempt %1 of %2 in %3 milliseconds +An info message issued when the server is scheduling the next attempt to reconnect +to the database. This occurs when the server has lost database connectivity and +is attempting to reconnect automatically. + +% MYSQL_HB_DB_RECONNECT_FAILED maximum number of database reconnect attempts: %1, has been exhausted without success +An error message issued when the server failed to reconnect. Loss of connectivity +is typically a network or database server issue. + +% MYSQL_HB_NO_TLS TLS was required but is not used +This error message is issued when TLS for the connection was required but +TLS is not used. + +% MYSQL_HB_TLS_CIPHER TLS cipher: %1 +Logged at debug log level 40. +A debug message issued when a new MySQL connected is created with TLS. +The TLS cipher name is logged. + diff --git a/src/hooks/dhcp/mysql/mysql_host_data_source.cc b/src/hooks/dhcp/mysql/mysql_host_data_source.cc index ac04d1fe21..7dcc08d3a9 100644 --- a/src/hooks/dhcp/mysql/mysql_host_data_source.cc +++ b/src/hooks/dhcp/mysql/mysql_host_data_source.cc @@ -2983,10 +2983,10 @@ MySqlHostDataSourceImpl::createContext() const { if (ctx->conn_.getTls()) { std::string cipher = ctx->conn_.getTlsCipher(); if (cipher.empty()) { - LOG_ERROR(dhcpsrv_logger, DHCPSRV_MYSQL_NO_TLS); + LOG_ERROR(mysql_hb_logger, MYSQL_HB_NO_TLS); } else { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE, - DHCPSRV_MYSQL_TLS_CIPHER) + LOG_DEBUG(mysql_hb_logger, MYSQL_HB_DBG_TRACE, + MYSQL_HB_TLS_CIPHER) .arg(cipher); } } @@ -3008,7 +3008,7 @@ MySqlHostDataSourceImpl::createContext() const { ctx->conn_.prepareStatements(tagged_statements.begin() + WRITE_STMTS_BEGIN, tagged_statements.end()); } else { - LOG_INFO(dhcpsrv_logger, DHCPSRV_MYSQL_HOST_DB_READONLY); + LOG_INFO(mysql_hb_logger, MYSQL_HB_DB_READONLY); } // Create the exchange objects for use in exchanging data between the @@ -3053,7 +3053,7 @@ MySqlHostDataSourceImpl::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) { } reopened = true; } catch (const std::exception& ex) { - LOG_ERROR(dhcpsrv_logger, DHCPSRV_MYSQL_HOST_DB_RECONNECT_ATTEMPT_FAILED) + LOG_ERROR(mysql_hb_logger, MYSQL_HB_DB_RECONNECT_ATTEMPT_FAILED) .arg(ex.what()); } @@ -3070,7 +3070,7 @@ MySqlHostDataSourceImpl::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) { } else { if (!db_reconnect_ctl->checkRetries()) { // We're out of retries, log it and initiate shutdown. - LOG_ERROR(dhcpsrv_logger, DHCPSRV_MYSQL_HOST_DB_RECONNECT_FAILED) + LOG_ERROR(mysql_hb_logger, MYSQL_HB_DB_RECONNECT_FAILED) .arg(db_reconnect_ctl->maxRetries()); // Cancel the timer. @@ -3083,7 +3083,7 @@ MySqlHostDataSourceImpl::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) { return (false); } - LOG_INFO(dhcpsrv_logger, DHCPSRV_MYSQL_HOST_DB_RECONNECT_ATTEMPT_SCHEDULE) + LOG_INFO(mysql_hb_logger, MYSQL_HB_DB_RECONNECT_ATTEMPT_SCHEDULE) .arg(db_reconnect_ctl->maxRetries() - db_reconnect_ctl->retriesLeft() + 1) .arg(db_reconnect_ctl->maxRetries()) .arg(db_reconnect_ctl->retryInterval()); @@ -3103,7 +3103,7 @@ MySqlHostDataSourceImpl::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) { std::pair MySqlHostDataSourceImpl::getVersion(const std::string& timer_name) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_HOST_DB_GET_VERSION); + LOG_DEBUG(mysql_hb_logger, MYSQL_HB_DBG_TRACE_DETAIL, MYSQL_HB_DB_GET_VERSION); IOServiceAccessorPtr ac(new IOServiceAccessor(&DatabaseConnection::getIOService)); DbCallback cb(&MySqlHostDataSourceImpl::dbReconnect); diff --git a/src/hooks/dhcp/mysql/mysql_lb_log.cc b/src/hooks/dhcp/mysql/mysql_lb_log.cc index 2064ae5432..2177df4fcd 100644 --- a/src/hooks/dhcp/mysql/mysql_lb_log.cc +++ b/src/hooks/dhcp/mysql/mysql_lb_log.cc @@ -11,6 +11,13 @@ namespace isc { namespace dhcp { +extern const int MYSQL_LB_DBG_TRACE = isc::log::DBGLVL_TRACE_BASIC; +extern const int MYSQL_LB_DBG_RESULTS = isc::log::DBGLVL_TRACE_BASIC_DATA; +extern const int MYSQL_LB_DBG_TRACE_DETAIL = isc::log::DBGLVL_TRACE_DETAIL; +extern const int MYSQL_LB_DBG_TRACE_DETAIL_DATA = + isc::log::DBGLVL_TRACE_DETAIL_DATA; +extern const int MYSQL_LB_DBG_HOOKS = isc::log::DBGLVL_TRACE_BASIC; + isc::log::Logger mysql_lb_logger("mysql-lb-hooks"); } // namespace dhcp diff --git a/src/hooks/dhcp/mysql/mysql_lb_log.h b/src/hooks/dhcp/mysql/mysql_lb_log.h index 444dc95bff..7e6a49d460 100644 --- a/src/hooks/dhcp/mysql/mysql_lb_log.h +++ b/src/hooks/dhcp/mysql/mysql_lb_log.h @@ -14,6 +14,43 @@ namespace isc { namespace dhcp { +///@{ +/// @brief MySQL Lease Mgr logging levels +/// +/// Defines the levels used to output debug messages in the MySQL Lease Mgr +/// Note that higher numbers equate to more verbose (and detailed) output. + +/// @brief Traces normal operations +/// +/// E.g. sending a query to the database etc. +extern const int MYSQL_LB_DBG_TRACE; + +/// @brief Records the results of the lookups +/// +/// Using the example of tracing queries from the backend database, this will +/// just record the summary results. +extern const int MYSQL_LB_DBG_RESULTS; + +/// @brief Additional information +/// +/// Record detailed tracing. This is generally reserved for tracing access to +/// the lease database. +extern const int MYSQL_LB_DBG_TRACE_DETAIL; + +/// @brief Additional information +/// +/// Record detailed (and verbose) data on the server. +extern const int MYSQL_LB_DBG_TRACE_DETAIL_DATA; + +// Trace hook related operations +extern const int MYSQL_LB_DBG_HOOKS; +///@} + +/// @brief MySQL Lease Mgr Logger +/// +/// Define the logger used to log messages. We could define it in multiple +/// modules, but defining in a single module and linking to it saves time and +/// space. extern isc::log::Logger mysql_lb_logger; } // namespace dhcp diff --git a/src/hooks/dhcp/mysql/mysql_lb_messages.cc b/src/hooks/dhcp/mysql/mysql_lb_messages.cc index 9551966c67..5fdd94f8f2 100644 --- a/src/hooks/dhcp/mysql/mysql_lb_messages.cc +++ b/src/hooks/dhcp/mysql/mysql_lb_messages.cc @@ -1,4 +1,4 @@ -// File created from ../../../../src/hooks/dhcp/mysql_lb/mysql_lb_messages.mes +// File created from ../../../../src/hooks/dhcp/mysql/mysql_lb_messages.mes #include #include @@ -7,9 +7,57 @@ namespace isc { namespace dhcp { +extern const isc::log::MessageID MYSQL_LB_ADD_ADDR4 = "MYSQL_LB_ADD_ADDR4"; +extern const isc::log::MessageID MYSQL_LB_ADD_ADDR6 = "MYSQL_LB_ADD_ADDR6"; +extern const isc::log::MessageID MYSQL_LB_COMMIT = "MYSQL_LB_COMMIT"; extern const isc::log::MessageID MYSQL_LB_DB = "MYSQL_LB_DB"; +extern const isc::log::MessageID MYSQL_LB_DB_RECONNECT_ATTEMPT_FAILED = "MYSQL_LB_DB_RECONNECT_ATTEMPT_FAILED"; +extern const isc::log::MessageID MYSQL_LB_DB_RECONNECT_ATTEMPT_SCHEDULE = "MYSQL_LB_DB_RECONNECT_ATTEMPT_SCHEDULE"; +extern const isc::log::MessageID MYSQL_LB_DB_RECONNECT_FAILED = "MYSQL_LB_DB_RECONNECT_FAILED"; extern const isc::log::MessageID MYSQL_LB_DEINIT_OK = "MYSQL_LB_DEINIT_OK"; +extern const isc::log::MessageID MYSQL_LB_DELETED_EXPIRED_RECLAIMED = "MYSQL_LB_DELETED_EXPIRED_RECLAIMED"; +extern const isc::log::MessageID MYSQL_LB_DELETE_ADDR4 = "MYSQL_LB_DELETE_ADDR4"; +extern const isc::log::MessageID MYSQL_LB_DELETE_ADDR6 = "MYSQL_LB_DELETE_ADDR6"; +extern const isc::log::MessageID MYSQL_LB_DELETE_EXPIRED_RECLAIMED4 = "MYSQL_LB_DELETE_EXPIRED_RECLAIMED4"; +extern const isc::log::MessageID MYSQL_LB_DELETE_EXPIRED_RECLAIMED6 = "MYSQL_LB_DELETE_EXPIRED_RECLAIMED6"; +extern const isc::log::MessageID MYSQL_LB_GET4 = "MYSQL_LB_GET4"; +extern const isc::log::MessageID MYSQL_LB_GET6 = "MYSQL_LB_GET6"; +extern const isc::log::MessageID MYSQL_LB_GET_ADDR4 = "MYSQL_LB_GET_ADDR4"; +extern const isc::log::MessageID MYSQL_LB_GET_ADDR6 = "MYSQL_LB_GET_ADDR6"; +extern const isc::log::MessageID MYSQL_LB_GET_CLIENTID = "MYSQL_LB_GET_CLIENTID"; +extern const isc::log::MessageID MYSQL_LB_GET_DUID = "MYSQL_LB_GET_DUID"; +extern const isc::log::MessageID MYSQL_LB_GET_EXPIRED4 = "MYSQL_LB_GET_EXPIRED4"; +extern const isc::log::MessageID MYSQL_LB_GET_EXPIRED6 = "MYSQL_LB_GET_EXPIRED6"; +extern const isc::log::MessageID MYSQL_LB_GET_HOSTNAME4 = "MYSQL_LB_GET_HOSTNAME4"; +extern const isc::log::MessageID MYSQL_LB_GET_HOSTNAME6 = "MYSQL_LB_GET_HOSTNAME6"; +extern const isc::log::MessageID MYSQL_LB_GET_HWADDR = "MYSQL_LB_GET_HWADDR"; +extern const isc::log::MessageID MYSQL_LB_GET_IAID_DUID = "MYSQL_LB_GET_IAID_DUID"; +extern const isc::log::MessageID MYSQL_LB_GET_IAID_SUBID_DUID = "MYSQL_LB_GET_IAID_SUBID_DUID"; +extern const isc::log::MessageID MYSQL_LB_GET_PAGE4 = "MYSQL_LB_GET_PAGE4"; +extern const isc::log::MessageID MYSQL_LB_GET_PAGE6 = "MYSQL_LB_GET_PAGE6"; +extern const isc::log::MessageID MYSQL_LB_GET_RELAYID4 = "MYSQL_LB_GET_RELAYID4"; +extern const isc::log::MessageID MYSQL_LB_GET_RELAYID6 = "MYSQL_LB_GET_RELAYID6"; +extern const isc::log::MessageID MYSQL_LB_GET_REMOTEID4 = "MYSQL_LB_GET_REMOTEID4"; +extern const isc::log::MessageID MYSQL_LB_GET_REMOTEID6 = "MYSQL_LB_GET_REMOTEID6"; +extern const isc::log::MessageID MYSQL_LB_GET_SUBID4 = "MYSQL_LB_GET_SUBID4"; +extern const isc::log::MessageID MYSQL_LB_GET_SUBID6 = "MYSQL_LB_GET_SUBID6"; +extern const isc::log::MessageID MYSQL_LB_GET_SUBID_CLIENTID = "MYSQL_LB_GET_SUBID_CLIENTID"; +extern const isc::log::MessageID MYSQL_LB_GET_SUBID_HWADDR = "MYSQL_LB_GET_SUBID_HWADDR"; +extern const isc::log::MessageID MYSQL_LB_GET_SUBID_PAGE6 = "MYSQL_LB_GET_SUBID_PAGE6"; +extern const isc::log::MessageID MYSQL_LB_GET_VERSION = "MYSQL_LB_GET_VERSION"; extern const isc::log::MessageID MYSQL_LB_INIT_OK = "MYSQL_LB_INIT_OK"; +extern const isc::log::MessageID MYSQL_LB_NEGATIVE_LEASES_STAT = "MYSQL_LB_NEGATIVE_LEASES_STAT"; +extern const isc::log::MessageID MYSQL_LB_NO_TLS = "MYSQL_LB_NO_TLS"; +extern const isc::log::MessageID MYSQL_LB_ROLLBACK = "MYSQL_LB_ROLLBACK"; +extern const isc::log::MessageID MYSQL_LB_TLS_CIPHER = "MYSQL_LB_TLS_CIPHER"; +extern const isc::log::MessageID MYSQL_LB_UPDATE_ADDR4 = "MYSQL_LB_UPDATE_ADDR4"; +extern const isc::log::MessageID MYSQL_LB_UPDATE_ADDR6 = "MYSQL_LB_UPDATE_ADDR6"; +extern const isc::log::MessageID MYSQL_LB_UPGRADE_EXTENDED_INFO4 = "MYSQL_LB_UPGRADE_EXTENDED_INFO4"; +extern const isc::log::MessageID MYSQL_LB_UPGRADE_EXTENDED_INFO4_ERROR = "MYSQL_LB_UPGRADE_EXTENDED_INFO4_ERROR"; +extern const isc::log::MessageID MYSQL_LB_UPGRADE_EXTENDED_INFO4_PAGE = "MYSQL_LB_UPGRADE_EXTENDED_INFO4_PAGE"; +extern const isc::log::MessageID MYSQL_LB_UPGRADE_EXTENDED_INFO6 = "MYSQL_LB_UPGRADE_EXTENDED_INFO6"; +extern const isc::log::MessageID MYSQL_LB_UPGRADE_EXTENDED_INFO6_ERROR = "MYSQL_LB_UPGRADE_EXTENDED_INFO6_ERROR"; +extern const isc::log::MessageID MYSQL_LB_UPGRADE_EXTENDED_INFO6_PAGE = "MYSQL_LB_UPGRADE_EXTENDED_INFO6_PAGE"; } // namespace dhcp } // namespace isc @@ -17,9 +65,57 @@ extern const isc::log::MessageID MYSQL_LB_INIT_OK = "MYSQL_LB_INIT_OK"; namespace { const char* values[] = { + "MYSQL_LB_ADD_ADDR4", "adding IPv4 lease with address %1", + "MYSQL_LB_ADD_ADDR6", "adding IPv6 lease with address %1, lease type %2", + "MYSQL_LB_COMMIT", "committing to MySQL database", "MYSQL_LB_DB", "opening MySQL lease database: %1", + "MYSQL_LB_DB_RECONNECT_ATTEMPT_FAILED", "database reconnect failed: %1", + "MYSQL_LB_DB_RECONNECT_ATTEMPT_SCHEDULE", "scheduling attempt %1 of %2 in %3 milliseconds", + "MYSQL_LB_DB_RECONNECT_FAILED", "maximum number of database reconnect attempts: %1, has been exhausted without success", "MYSQL_LB_DEINIT_OK", "unloading MySQL LB hooks library successful", + "MYSQL_LB_DELETED_EXPIRED_RECLAIMED", "deleted %1 reclaimed leases from the database", + "MYSQL_LB_DELETE_ADDR4", "deleting lease for address %1", + "MYSQL_LB_DELETE_ADDR6", "deleting lease for address %1", + "MYSQL_LB_DELETE_EXPIRED_RECLAIMED4", "deleting reclaimed IPv4 leases that expired more than %1 seconds ago", + "MYSQL_LB_DELETE_EXPIRED_RECLAIMED6", "deleting reclaimed IPv6 leases that expired more than %1 seconds ago", + "MYSQL_LB_GET4", "obtaining all IPv4 leases", + "MYSQL_LB_GET6", "obtaining all IPv6 leases", + "MYSQL_LB_GET_ADDR4", "obtaining IPv4 lease for address %1", + "MYSQL_LB_GET_ADDR6", "obtaining IPv6 lease for address %1, lease type %2", + "MYSQL_LB_GET_CLIENTID", "obtaining IPv4 leases for client ID %1", + "MYSQL_LB_GET_DUID", "obtaining IPv6 lease for duid %1,", + "MYSQL_LB_GET_EXPIRED4", "obtaining maximum %1 of expired IPv4 leases", + "MYSQL_LB_GET_EXPIRED6", "obtaining maximum %1 of expired IPv6 leases", + "MYSQL_LB_GET_HOSTNAME4", "obtaining IPv4 leases for hostname %1", + "MYSQL_LB_GET_HOSTNAME6", "obtaining IPv6 leases for hostname %1", + "MYSQL_LB_GET_HWADDR", "obtaining IPv4 leases for hardware address %1", + "MYSQL_LB_GET_IAID_DUID", "obtaining IPv6 leases for IAID %1, DUID %2, lease type %3", + "MYSQL_LB_GET_IAID_SUBID_DUID", "obtaining IPv6 leases for IAID %1, Subnet ID %2, DUID %3, lease type %4", + "MYSQL_LB_GET_PAGE4", "obtaining at most %1 IPv4 leases starting from address %2", + "MYSQL_LB_GET_PAGE6", "obtaining at most %1 IPv6 leases starting from address %2", + "MYSQL_LB_GET_RELAYID4", "obtaining at most %1 IPv4 leases starting from address %2 with relay id %3 and cltt between %4 and %5", + "MYSQL_LB_GET_RELAYID6", "obtaining at most %1 IPv6 leases starting from address %2 with relay id %3", + "MYSQL_LB_GET_REMOTEID4", "obtaining at most %1 IPv4 leases starting from address %2 with remote id %3 and cltt between %4 and %5", + "MYSQL_LB_GET_REMOTEID6", "obtaining at most %1 IPv6 leases starting from address %2 with remote id %3", + "MYSQL_LB_GET_SUBID4", "obtaining IPv4 leases for subnet ID %1", + "MYSQL_LB_GET_SUBID6", "obtaining IPv6 leases for subnet ID %1", + "MYSQL_LB_GET_SUBID_CLIENTID", "obtaining IPv4 lease for subnet ID %1 and client ID %2", + "MYSQL_LB_GET_SUBID_HWADDR", "obtaining IPv4 lease for subnet ID %1 and hardware address %2", + "MYSQL_LB_GET_SUBID_PAGE6", "obtaining at most %1 IPv6 leases starting from address %2 for subnet ID %3", + "MYSQL_LB_GET_VERSION", "obtaining schema version information", "MYSQL_LB_INIT_OK", "loading MySQL LB hooks library successful", + "MYSQL_LB_NEGATIVE_LEASES_STAT", "recount of leases returned a negative value", + "MYSQL_LB_NO_TLS", "TLS was required but is not used", + "MYSQL_LB_ROLLBACK", "rolling back MySQL database", + "MYSQL_LB_TLS_CIPHER", "TLS cipher: %1", + "MYSQL_LB_UPDATE_ADDR4", "updating IPv4 lease for address %1", + "MYSQL_LB_UPDATE_ADDR6", "updating IPv6 lease for address %1, lease type %2", + "MYSQL_LB_UPGRADE_EXTENDED_INFO4", "upgrading IPv4 leases done in %1 pages with %2 updated leases", + "MYSQL_LB_UPGRADE_EXTENDED_INFO4_ERROR", "upgrading extending info for IPv4 lease at %1 failed with %2", + "MYSQL_LB_UPGRADE_EXTENDED_INFO4_PAGE", "upgrading IPv4 lease extended info at page %1 starting at %2 (updated %3)", + "MYSQL_LB_UPGRADE_EXTENDED_INFO6", "upgrading IPv6 leases done in %1 pages with %2 updated leases", + "MYSQL_LB_UPGRADE_EXTENDED_INFO6_ERROR", "upgrading extending info for IPv6 lease at %1 failed with %2", + "MYSQL_LB_UPGRADE_EXTENDED_INFO6_PAGE", "upgrading IPv6 lease extended info at page %1 starting at %2 (updated %3)", NULL }; diff --git a/src/hooks/dhcp/mysql/mysql_lb_messages.h b/src/hooks/dhcp/mysql/mysql_lb_messages.h index b58d226531..3d417a2c3e 100644 --- a/src/hooks/dhcp/mysql/mysql_lb_messages.h +++ b/src/hooks/dhcp/mysql/mysql_lb_messages.h @@ -1,4 +1,4 @@ -// File created from ../../../../src/hooks/dhcp/mysql_lb/mysql_lb_messages.mes +// File created from ../../../../src/hooks/dhcp/mysql/mysql_lb_messages.mes #ifndef MYSQL_LB_MESSAGES_H #define MYSQL_LB_MESSAGES_H @@ -8,9 +8,57 @@ namespace isc { namespace dhcp { +extern const isc::log::MessageID MYSQL_LB_ADD_ADDR4; +extern const isc::log::MessageID MYSQL_LB_ADD_ADDR6; +extern const isc::log::MessageID MYSQL_LB_COMMIT; extern const isc::log::MessageID MYSQL_LB_DB; +extern const isc::log::MessageID MYSQL_LB_DB_RECONNECT_ATTEMPT_FAILED; +extern const isc::log::MessageID MYSQL_LB_DB_RECONNECT_ATTEMPT_SCHEDULE; +extern const isc::log::MessageID MYSQL_LB_DB_RECONNECT_FAILED; extern const isc::log::MessageID MYSQL_LB_DEINIT_OK; +extern const isc::log::MessageID MYSQL_LB_DELETED_EXPIRED_RECLAIMED; +extern const isc::log::MessageID MYSQL_LB_DELETE_ADDR4; +extern const isc::log::MessageID MYSQL_LB_DELETE_ADDR6; +extern const isc::log::MessageID MYSQL_LB_DELETE_EXPIRED_RECLAIMED4; +extern const isc::log::MessageID MYSQL_LB_DELETE_EXPIRED_RECLAIMED6; +extern const isc::log::MessageID MYSQL_LB_GET4; +extern const isc::log::MessageID MYSQL_LB_GET6; +extern const isc::log::MessageID MYSQL_LB_GET_ADDR4; +extern const isc::log::MessageID MYSQL_LB_GET_ADDR6; +extern const isc::log::MessageID MYSQL_LB_GET_CLIENTID; +extern const isc::log::MessageID MYSQL_LB_GET_DUID; +extern const isc::log::MessageID MYSQL_LB_GET_EXPIRED4; +extern const isc::log::MessageID MYSQL_LB_GET_EXPIRED6; +extern const isc::log::MessageID MYSQL_LB_GET_HOSTNAME4; +extern const isc::log::MessageID MYSQL_LB_GET_HOSTNAME6; +extern const isc::log::MessageID MYSQL_LB_GET_HWADDR; +extern const isc::log::MessageID MYSQL_LB_GET_IAID_DUID; +extern const isc::log::MessageID MYSQL_LB_GET_IAID_SUBID_DUID; +extern const isc::log::MessageID MYSQL_LB_GET_PAGE4; +extern const isc::log::MessageID MYSQL_LB_GET_PAGE6; +extern const isc::log::MessageID MYSQL_LB_GET_RELAYID4; +extern const isc::log::MessageID MYSQL_LB_GET_RELAYID6; +extern const isc::log::MessageID MYSQL_LB_GET_REMOTEID4; +extern const isc::log::MessageID MYSQL_LB_GET_REMOTEID6; +extern const isc::log::MessageID MYSQL_LB_GET_SUBID4; +extern const isc::log::MessageID MYSQL_LB_GET_SUBID6; +extern const isc::log::MessageID MYSQL_LB_GET_SUBID_CLIENTID; +extern const isc::log::MessageID MYSQL_LB_GET_SUBID_HWADDR; +extern const isc::log::MessageID MYSQL_LB_GET_SUBID_PAGE6; +extern const isc::log::MessageID MYSQL_LB_GET_VERSION; extern const isc::log::MessageID MYSQL_LB_INIT_OK; +extern const isc::log::MessageID MYSQL_LB_NEGATIVE_LEASES_STAT; +extern const isc::log::MessageID MYSQL_LB_NO_TLS; +extern const isc::log::MessageID MYSQL_LB_ROLLBACK; +extern const isc::log::MessageID MYSQL_LB_TLS_CIPHER; +extern const isc::log::MessageID MYSQL_LB_UPDATE_ADDR4; +extern const isc::log::MessageID MYSQL_LB_UPDATE_ADDR6; +extern const isc::log::MessageID MYSQL_LB_UPGRADE_EXTENDED_INFO4; +extern const isc::log::MessageID MYSQL_LB_UPGRADE_EXTENDED_INFO4_ERROR; +extern const isc::log::MessageID MYSQL_LB_UPGRADE_EXTENDED_INFO4_PAGE; +extern const isc::log::MessageID MYSQL_LB_UPGRADE_EXTENDED_INFO6; +extern const isc::log::MessageID MYSQL_LB_UPGRADE_EXTENDED_INFO6_ERROR; +extern const isc::log::MessageID MYSQL_LB_UPGRADE_EXTENDED_INFO6_PAGE; } // namespace dhcp } // namespace isc diff --git a/src/hooks/dhcp/mysql/mysql_lb_messages.mes b/src/hooks/dhcp/mysql/mysql_lb_messages.mes index 33bfa83903..eefe6e66ce 100644 --- a/src/hooks/dhcp/mysql/mysql_lb_messages.mes +++ b/src/hooks/dhcp/mysql/mysql_lb_messages.mes @@ -7,6 +7,7 @@ $NAMESPACE isc::dhcp % MYSQL_LB_DB opening MySQL lease database: %1 +Logged at debug log level 50. This informational message is logged when a DHCP server (either V4 or V6) is about to open a MySQL lease database. The parameters of the connection including database name and username needed to access it @@ -19,3 +20,262 @@ library has been unloaded successfully. % MYSQL_LB_INIT_OK loading MySQL LB hooks library successful This informational message indicates that the MySQL Lease Backend hooks library has been loaded successfully. Enjoy! + +% MYSQL_LB_ADD_ADDR4 adding IPv4 lease with address %1 +Logged at debug log level 50. +A debug message issued when the server is about to add an IPv4 lease +with the specified address to the MySQL backend database. + +% MYSQL_LB_ADD_ADDR6 adding IPv6 lease with address %1, lease type %2 +Logged at debug log level 50. +A debug message issued when the server is about to add an IPv6 lease +with the specified address to the MySQL backend database. + +% MYSQL_LB_COMMIT committing to MySQL database +Logged at debug log level 50. +The code has issued a commit call. All outstanding transactions will be +committed to the database. Note that depending on the MySQL settings, +the commit may not include a write to disk. + +% MYSQL_LB_DELETED_EXPIRED_RECLAIMED deleted %1 reclaimed leases from the database +Logged at debug log level 50. +A debug message issued when the server has removed a number of reclaimed +leases from the database. The number of removed leases is included in the +message. + +% MYSQL_LB_DELETE_ADDR4 deleting lease for address %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to delete a lease for +the specified address from the MySQL database for the specified address. + +% MYSQL_LB_DELETE_ADDR6 deleting lease for address %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to delete a lease for +the specified address from the MySQL database for the specified address. + +% MYSQL_LB_DELETE_EXPIRED_RECLAIMED4 deleting reclaimed IPv4 leases that expired more than %1 seconds ago +Logged at debug log level 50. +A debug message issued when the server is removing reclaimed DHCPv4 +leases which have expired longer than a specified period of time. +The argument is the amount of time Kea waits after a reclaimed +lease expires before considering its removal. + +% MYSQL_LB_DELETE_EXPIRED_RECLAIMED6 deleting reclaimed IPv6 leases that expired more than %1 seconds ago +Logged at debug log level 50. +A debug message issued when the server is removing reclaimed DHCPv6 +leases which have expired longer than a specified period of time. +The argument is the amount of time Kea waits after a reclaimed +lease expires before considering its removal. + +% MYSQL_LB_GET4 obtaining all IPv4 leases +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain all IPv4 +leases from the MySQL database. + +% MYSQL_LB_GET6 obtaining all IPv6 leases +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain all IPv6 +leases from the MySQL database. + +% MYSQL_LB_GET_ADDR4 obtaining IPv4 lease for address %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain an IPv4 +lease from the MySQL database for the specified address. + +% MYSQL_LB_GET_ADDR6 obtaining IPv6 lease for address %1, lease type %2 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain an IPv6 +lease from the MySQL database for the specified address. + +% MYSQL_LB_GET_CLIENTID obtaining IPv4 leases for client ID %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a set +of IPv4 leases from the MySQL database for a client with the specified +client identification. + +% MYSQL_LB_GET_DUID obtaining IPv6 lease for duid %1, +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain an IPv6 +lease from the MySQL database for the specified duid. + +% MYSQL_LB_GET_EXPIRED4 obtaining maximum %1 of expired IPv4 leases +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain expired +IPv4 leases to reclaim them. The maximum number of leases to be retrieved +is logged in the message. + +% MYSQL_LB_GET_EXPIRED6 obtaining maximum %1 of expired IPv6 leases +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain expired +IPv6 leases to reclaim them. The maximum number of leases to be retrieved +is logged in the message. + +% MYSQL_LB_GET_HOSTNAME4 obtaining IPv4 leases for hostname %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a set +of IPv4 leases from the MySQL database for a client with the specified +hostname. + +% MYSQL_LB_GET_HOSTNAME6 obtaining IPv6 leases for hostname %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a set +of IPv6 leases from the MySQL database for a client with the specified +hostname. + +% MYSQL_LB_GET_HWADDR obtaining IPv4 leases for hardware address %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a set +of IPv4 leases from the MySQL database for a client with the specified +hardware address. + +% MYSQL_LB_GET_IAID_DUID obtaining IPv6 leases for IAID %1, DUID %2, lease type %3 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a set of IPv6 +leases from the MySQL database for a client with the specified IAID (Identity +Association ID) and DUID (DHCP Unique Identifier). + +% MYSQL_LB_GET_IAID_SUBID_DUID obtaining IPv6 leases for IAID %1, Subnet ID %2, DUID %3, lease type %4 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain an IPv6 +lease from the MySQL database for a client with the specified IAID +(Identity Association ID), Subnet ID and DUID (DHCP Unique Identifier). + +% MYSQL_LB_GET_PAGE4 obtaining at most %1 IPv4 leases starting from address %2 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a page +of leases beginning with the specified address. + +% MYSQL_LB_GET_PAGE6 obtaining at most %1 IPv6 leases starting from address %2 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a page +of leases beginning with the specified address. + +% MYSQL_LB_GET_RELAYID4 obtaining at most %1 IPv4 leases starting from address %2 with relay id %3 and cltt between %4 and %5 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a page of +IPv4 leases beginning with the specified address with a relay id and client +transaction time between start and end dates. + +% MYSQL_LB_GET_RELAYID6 obtaining at most %1 IPv6 leases starting from address %2 with relay id %3 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a page of +IPv6 leases beginning with the specified address with a relay id. + +% MYSQL_LB_GET_REMOTEID4 obtaining at most %1 IPv4 leases starting from address %2 with remote id %3 and cltt between %4 and %5 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a page of +IPv4 leases beginning with the specified address with a remote id and client +transaction time between start and end dates. + +% MYSQL_LB_GET_REMOTEID6 obtaining at most %1 IPv6 leases starting from address %2 with remote id %3 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a page of +IPv6 leases beginning with the specified address with a remote id. + +% MYSQL_LB_GET_SUBID4 obtaining IPv4 leases for subnet ID %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain all IPv4 +leases for a given subnet identifier from the MySQL database. + +% MYSQL_LB_GET_SUBID6 obtaining IPv6 leases for subnet ID %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain all IPv6 +leases for a given subnet identifier from the MySQL database. + +% MYSQL_LB_GET_SUBID_CLIENTID obtaining IPv4 lease for subnet ID %1 and client ID %2 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain an IPv4 +lease from the MySQL database for a client with the specified subnet ID +and client ID. + +% MYSQL_LB_GET_SUBID_HWADDR obtaining IPv4 lease for subnet ID %1 and hardware address %2 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain an IPv4 +lease from the MySQL database for a client with the specified subnet ID +and hardware address. + +% MYSQL_LB_GET_SUBID_PAGE6 obtaining at most %1 IPv6 leases starting from address %2 for subnet ID %3 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a page of +IPv6 leases from the MySQL database beginning with the specified address +for the specified subnet identifier. + +% MYSQL_LB_GET_VERSION obtaining schema version information +Logged at debug log level 50. +A debug message issued when the server is about to obtain schema version +information from the MySQL database. + +% MYSQL_LB_DB_RECONNECT_ATTEMPT_FAILED database reconnect failed: %1 +An error message issued when an attempt to reconnect has failed. + +% MYSQL_LB_DB_RECONNECT_ATTEMPT_SCHEDULE scheduling attempt %1 of %2 in %3 milliseconds +An info message issued when the server is scheduling the next attempt to reconnect +to the database. This occurs when the server has lost database connectivity and +is attempting to reconnect automatically. + +% MYSQL_LB_DB_RECONNECT_FAILED maximum number of database reconnect attempts: %1, has been exhausted without success +An error message issued when the server failed to reconnect. Loss of connectivity +is typically a network or database server issue. + +% MYSQL_LB_NEGATIVE_LEASES_STAT recount of leases returned a negative value +This warning message is issued when the recount of leases using counters +in the MySQL database returned a negative value. This shows a problem +which can be fixed only by an offline direct recount on the database. +This message is issued only once. + +% MYSQL_LB_NO_TLS TLS was required but is not used +This error message is issued when TLS for the connection was required but +TLS is not used. + +% MYSQL_LB_ROLLBACK rolling back MySQL database +Logged at debug log level 50. +The code has issued a rollback call. All outstanding transaction will +be rolled back and not committed to the database. + +% MYSQL_LB_TLS_CIPHER TLS cipher: %1 +Logged at debug log level 40. +A debug message issued when a new MySQL connected is created with TLS. +The TLS cipher name is logged. + +% MYSQL_LB_UPDATE_ADDR4 updating IPv4 lease for address %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to update IPv4 +lease from the MySQL database for the specified address. + +% MYSQL_LB_UPDATE_ADDR6 updating IPv6 lease for address %1, lease type %2 +Logged at debug log level 50. +A debug message issued when the server is attempting to update IPv6 +lease from the MySQL database for the specified address. + +% MYSQL_LB_UPGRADE_EXTENDED_INFO4 upgrading IPv4 leases done in %1 pages with %2 updated leases +Logged at debug log level 40. +The server upgraded extended info. The number of pages and the final count of +updated leases are displayed. + +% MYSQL_LB_UPGRADE_EXTENDED_INFO4_ERROR upgrading extending info for IPv4 lease at %1 failed with %2 +Logged at debug log level 40. +A debug message issued when the server failed to upgrade an extended info. +The address of the lease and the error message are displayed. + +% MYSQL_LB_UPGRADE_EXTENDED_INFO4_PAGE upgrading IPv4 lease extended info at page %1 starting at %2 (updated %3) +Logged at debug log level 50. +A debug message issued when the server upgrades IPv4 lease extended info. +The page number and started address, and the count of already updated leases +are displayed. + +% MYSQL_LB_UPGRADE_EXTENDED_INFO6 upgrading IPv6 leases done in %1 pages with %2 updated leases +Logged at debug log level 40. +The server upgraded extended info. The number of pages and the final count of +updated leases are displayed. + +% MYSQL_LB_UPGRADE_EXTENDED_INFO6_ERROR upgrading extending info for IPv6 lease at %1 failed with %2 +Logged at debug log level 40. +A debug message issued when the server failed to upgrade the extended info +for a lease. The address of the lease and the error message are displayed. + +% MYSQL_LB_UPGRADE_EXTENDED_INFO6_PAGE upgrading IPv6 lease extended info at page %1 starting at %2 (updated %3) +Logged at debug log level 50. +A debug message issued when the server upgrades IPv6 lease extended info. +The page number and started address, and the count of already updated leases +are displayed. + diff --git a/src/hooks/dhcp/mysql/mysql_lease_mgr.cc b/src/hooks/dhcp/mysql/mysql_lease_mgr.cc index a5ea390f27..c8b11eb012 100644 --- a/src/hooks/dhcp/mysql/mysql_lease_mgr.cc +++ b/src/hooks/dhcp/mysql/mysql_lease_mgr.cc @@ -2018,7 +2018,7 @@ public: row.state_count_ = 0; if (!negative_count_) { negative_count_ = true; - LOG_WARN(dhcpsrv_logger, DHCPSRV_MYSQL_NEGATIVE_LEASES_STAT); + LOG_WARN(mysql_lb_logger, MYSQL_LB_NEGATIVE_LEASES_STAT); } } have_row = true; @@ -2212,7 +2212,7 @@ MySqlLeaseMgr::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) { LeaseMgrFactory::recreate(cfg_db->getLeaseDbAccessString()); reopened = true; } catch (const std::exception& ex) { - LOG_ERROR(dhcpsrv_logger, DHCPSRV_MYSQL_LEASE_DB_RECONNECT_ATTEMPT_FAILED) + LOG_ERROR(mysql_lb_logger, MYSQL_LB_DB_RECONNECT_ATTEMPT_FAILED) .arg(ex.what()); } @@ -2229,7 +2229,7 @@ MySqlLeaseMgr::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) { } else { if (!db_reconnect_ctl->checkRetries()) { // We're out of retries, log it and initiate shutdown. - LOG_ERROR(dhcpsrv_logger, DHCPSRV_MYSQL_LEASE_DB_RECONNECT_FAILED) + LOG_ERROR(mysql_lb_logger, MYSQL_LB_DB_RECONNECT_FAILED) .arg(db_reconnect_ctl->maxRetries()); // Cancel the timer. @@ -2242,7 +2242,7 @@ MySqlLeaseMgr::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) { return (false); } - LOG_INFO(dhcpsrv_logger, DHCPSRV_MYSQL_LEASE_DB_RECONNECT_ATTEMPT_SCHEDULE) + LOG_INFO(mysql_lb_logger, MYSQL_LB_DB_RECONNECT_ATTEMPT_SCHEDULE) .arg(db_reconnect_ctl->maxRetries() - db_reconnect_ctl->retriesLeft() + 1) .arg(db_reconnect_ctl->maxRetries()) .arg(db_reconnect_ctl->retryInterval()); @@ -2278,10 +2278,10 @@ MySqlLeaseMgr::createContext() const { if (ctx->conn_.getTls()) { std::string cipher = ctx->conn_.getTlsCipher(); if (cipher.empty()) { - LOG_ERROR(dhcpsrv_logger, DHCPSRV_MYSQL_NO_TLS); + LOG_ERROR(mysql_lb_logger, MYSQL_LB_NO_TLS); } else { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE, - DHCPSRV_MYSQL_TLS_CIPHER) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE, + MYSQL_LB_TLS_CIPHER) .arg(cipher); } } @@ -2338,7 +2338,7 @@ MySqlLeaseMgr::addLeaseCommon(MySqlLeaseContextPtr& ctx, bool MySqlLeaseMgr::addLease(const Lease4Ptr& lease) { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_ADD_ADDR4) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_ADD_ADDR4) .arg(lease->addr_.toText()); // Get a context @@ -2365,7 +2365,7 @@ MySqlLeaseMgr::addLease(const Lease4Ptr& lease) { bool MySqlLeaseMgr::addLease(const Lease6Ptr& lease) { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_ADD_ADDR6) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_ADD_ADDR6) .arg(lease->addr_.toText()) .arg(lease->type_); @@ -2532,7 +2532,7 @@ MySqlLeaseMgr::getLease(MySqlLeaseContextPtr& ctx, Lease4Ptr MySqlLeaseMgr::getLease4(const IOAddress& addr) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET_ADDR4) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_GET_ADDR4) .arg(addr.toText()); // Set up the WHERE clause value @@ -2558,7 +2558,7 @@ MySqlLeaseMgr::getLease4(const IOAddress& addr) const { Lease4Collection MySqlLeaseMgr::getLease4(const HWAddr& hwaddr) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET_HWADDR) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_GET_HWADDR) .arg(hwaddr.toText()); // Set up the WHERE clause value @@ -2599,7 +2599,7 @@ MySqlLeaseMgr::getLease4(const HWAddr& hwaddr) const { Lease4Ptr MySqlLeaseMgr::getLease4(const HWAddr& hwaddr, SubnetID subnet_id) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET_SUBID_HWADDR) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_GET_SUBID_HWADDR) .arg(subnet_id) .arg(hwaddr.toText()); @@ -2645,7 +2645,7 @@ MySqlLeaseMgr::getLease4(const HWAddr& hwaddr, SubnetID subnet_id) const { Lease4Collection MySqlLeaseMgr::getLease4(const ClientId& clientid) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET_CLIENTID) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_GET_CLIENTID) .arg(clientid.toText()); // Set up the WHERE clause value @@ -2681,7 +2681,7 @@ MySqlLeaseMgr::getLease4(const ClientId& clientid) const { Lease4Ptr MySqlLeaseMgr::getLease4(const ClientId& clientid, SubnetID subnet_id) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET_SUBID_CLIENTID) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_GET_SUBID_CLIENTID) .arg(subnet_id) .arg(clientid.toText()); @@ -2722,7 +2722,7 @@ MySqlLeaseMgr::getLease4(const ClientId& clientid, SubnetID subnet_id) const { Lease4Collection MySqlLeaseMgr::getLeases4(SubnetID subnet_id) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET_SUBID4) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_GET_SUBID4) .arg(subnet_id); // Set up the WHERE clause value @@ -2748,7 +2748,7 @@ MySqlLeaseMgr::getLeases4(SubnetID subnet_id) const { Lease4Collection MySqlLeaseMgr::getLeases4(const std::string& hostname) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET_HOSTNAME4) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_GET_HOSTNAME4) .arg(hostname); // Set up the WHERE clause value @@ -2774,7 +2774,7 @@ MySqlLeaseMgr::getLeases4(const std::string& hostname) const { Lease4Collection MySqlLeaseMgr::getLeases4() const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET4); + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_GET4); Lease4Collection result; @@ -2797,7 +2797,7 @@ MySqlLeaseMgr::getLeases4(const IOAddress& lower_bound_address, << lower_bound_address); } - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET_PAGE4) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_GET_PAGE4) .arg(page_size.page_size_) .arg(lower_bound_address.toText()); @@ -2832,7 +2832,7 @@ MySqlLeaseMgr::getLeases4(const IOAddress& lower_bound_address, Lease6Ptr MySqlLeaseMgr::getLease6(Lease::Type lease_type, const IOAddress& addr) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET_ADDR6) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_GET_ADDR6) .arg(addr.toText()) .arg(lease_type); @@ -2871,7 +2871,7 @@ MySqlLeaseMgr::getLease6(Lease::Type lease_type, Lease6Collection MySqlLeaseMgr::getLeases6(Lease::Type lease_type, const DUID& duid, uint32_t iaid) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET_IAID_DUID) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_GET_IAID_DUID) .arg(iaid) .arg(duid.toText()) .arg(lease_type); @@ -2934,7 +2934,7 @@ MySqlLeaseMgr::getLeases6(Lease::Type lease_type, const DUID& duid, Lease6Collection MySqlLeaseMgr::getLeases6(Lease::Type lease_type, const DUID& duid, uint32_t iaid, SubnetID subnet_id) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET_IAID_SUBID_DUID) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_GET_IAID_SUBID_DUID) .arg(iaid) .arg(subnet_id) .arg(duid.toText()) @@ -2983,7 +2983,7 @@ MySqlLeaseMgr::getLeases6(Lease::Type lease_type, const DUID& duid, Lease6Collection MySqlLeaseMgr::getLeases6(SubnetID subnet_id) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET_SUBID6) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_GET_SUBID6) .arg(subnet_id); // Set up the WHERE clause value @@ -3011,8 +3011,8 @@ Lease6Collection MySqlLeaseMgr::getLeases6(SubnetID subnet_id, const IOAddress& lower_bound_address, const LeasePageSize& page_size) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, - DHCPSRV_MYSQL_GET_SUBID_PAGE6) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, + MYSQL_LB_GET_SUBID_PAGE6) .arg(page_size.page_size_) .arg(lower_bound_address.toText()) .arg(subnet_id); @@ -3063,7 +3063,7 @@ MySqlLeaseMgr::getLeases6(SubnetID subnet_id, Lease6Collection MySqlLeaseMgr::getLeases6() const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET6); + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_GET6); Lease6Collection result; @@ -3078,7 +3078,7 @@ MySqlLeaseMgr::getLeases6() const { Lease6Collection MySqlLeaseMgr::getLeases6(const DUID& duid) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET_DUID) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_GET_DUID) .arg(duid.toText()); // Set up the WHERE clause value @@ -3107,7 +3107,7 @@ MySqlLeaseMgr::getLeases6(const DUID& duid) const { Lease6Collection MySqlLeaseMgr::getLeases6(const std::string& hostname) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET_HOSTNAME6) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_GET_HOSTNAME6) .arg(hostname); // Set up the WHERE clause value @@ -3141,7 +3141,7 @@ MySqlLeaseMgr::getLeases6(const IOAddress& lower_bound_address, << lower_bound_address); } - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET_PAGE6) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_GET_PAGE6) .arg(page_size.page_size_) .arg(lower_bound_address.toText()); @@ -3182,7 +3182,7 @@ MySqlLeaseMgr::getLeases6(const IOAddress& lower_bound_address, void MySqlLeaseMgr::getExpiredLeases4(Lease4Collection& expired_leases, const size_t max_leases) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET_EXPIRED4) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_GET_EXPIRED4) .arg(max_leases); getExpiredLeasesCommon(expired_leases, max_leases, GET_LEASE4_EXPIRE); } @@ -3190,7 +3190,7 @@ MySqlLeaseMgr::getExpiredLeases4(Lease4Collection& expired_leases, void MySqlLeaseMgr::getExpiredLeases6(Lease6Collection& expired_leases, const size_t max_leases) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET_EXPIRED6) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_GET_EXPIRED6) .arg(max_leases); getExpiredLeasesCommon(expired_leases, max_leases, GET_LEASE6_EXPIRE); } @@ -3277,7 +3277,7 @@ void MySqlLeaseMgr::updateLease4(const Lease4Ptr& lease) { const StatementIndex stindex = UPDATE_LEASE4; - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_UPDATE_ADDR4) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_UPDATE_ADDR4) .arg(lease->addr_.toText()); // Get a context @@ -3329,7 +3329,7 @@ void MySqlLeaseMgr::updateLease6(const Lease6Ptr& lease) { const StatementIndex stindex = UPDATE_LEASE6; - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_UPDATE_ADDR6) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_UPDATE_ADDR6) .arg(lease->addr_.toText()) .arg(lease->type_); @@ -3431,7 +3431,8 @@ MySqlLeaseMgr::deleteLeaseCommon(MySqlLeaseContextPtr& ctx, bool MySqlLeaseMgr::deleteLease(const Lease4Ptr& lease) { const IOAddress& addr = lease->addr_; - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_DELETE_ADDR) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, + MYSQL_LB_DELETE_ADDR4) .arg(addr.toText()); // Set up the WHERE clause value @@ -3485,8 +3486,8 @@ MySqlLeaseMgr::deleteLease(const Lease4Ptr& lease) { bool MySqlLeaseMgr::deleteLease(const Lease6Ptr& lease) { const IOAddress& addr = lease->addr_; - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, - DHCPSRV_MYSQL_DELETE_ADDR) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, + MYSQL_LB_DELETE_ADDR6) .arg(addr.toText()); lease->extended_info_action_ = Lease6::ACTION_IGNORE; @@ -3551,14 +3552,14 @@ MySqlLeaseMgr::deleteLease(const Lease6Ptr& lease) { uint64_t MySqlLeaseMgr::deleteExpiredReclaimedLeases4(const uint32_t secs) { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED4) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_DELETE_EXPIRED_RECLAIMED4) .arg(secs); return (deleteExpiredReclaimedLeasesCommon(secs, DELETE_LEASE4_STATE_EXPIRED)); } uint64_t MySqlLeaseMgr::deleteExpiredReclaimedLeases6(const uint32_t secs) { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED6) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_DELETE_EXPIRED_RECLAIMED6) .arg(secs); return (deleteExpiredReclaimedLeasesCommon(secs, DELETE_LEASE6_STATE_EXPIRED)); } @@ -3589,7 +3590,7 @@ MySqlLeaseMgr::deleteExpiredReclaimedLeasesCommon(const uint32_t secs, // Get the number of deleted leases and log it. uint64_t deleted_leases = deleteLeaseCommon(ctx, statement_index, inbind); - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_DELETED_EXPIRED_RECLAIMED) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_DELETED_EXPIRED_RECLAIMED) .arg(deleted_leases); return (deleted_leases); @@ -3857,7 +3858,7 @@ MySqlLeaseMgr::getDescription() const { std::pair MySqlLeaseMgr::getVersion(const string& timer_name) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET_VERSION); + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_GET_VERSION); IOServiceAccessorPtr ac(new IOServiceAccessor(&DatabaseConnection::getIOService)); DbCallback cb(&MySqlLeaseMgr::dbReconnect); @@ -3867,12 +3868,12 @@ MySqlLeaseMgr::getVersion(const string& timer_name) const { void MySqlLeaseMgr::commit() { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_COMMIT); + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_COMMIT); } void MySqlLeaseMgr::rollback() { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_ROLLBACK); + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, MYSQL_LB_ROLLBACK); } void @@ -4062,8 +4063,8 @@ MySqlLeaseMgr::getLeases4ByRelayId(const OptionBuffer& relay_id, const LeasePageSize& page_size, const time_t& qry_start_time /* = 0 */, const time_t& qry_end_time /* = 0 */) { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, - DHCPSRV_MYSQL_GET_RELAYID4) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, + MYSQL_LB_GET_RELAYID4) .arg(page_size.page_size_) .arg(lower_bound_address.toText()) .arg(idToText(relay_id)) @@ -4175,8 +4176,8 @@ MySqlLeaseMgr::getLeases4ByRemoteId(const OptionBuffer& remote_id, const LeasePageSize& page_size, const time_t& qry_start_time /* = 0 */, const time_t& qry_end_time /* = 0 */) { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, - DHCPSRV_MYSQL_GET_REMOTEID4) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, + MYSQL_LB_GET_REMOTEID4) .arg(page_size.page_size_) .arg(lower_bound_address.toText()) .arg(idToText(remote_id)) @@ -4291,8 +4292,8 @@ MySqlLeaseMgr::upgradeExtendedInfo4(const LeasePageSize& page_size) { size_t updated = 0; IOAddress start_addr = IOAddress::IPV4_ZERO_ADDRESS(); for (;;) { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, - DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4_PAGE) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, + MYSQL_LB_UPGRADE_EXTENDED_INFO4_PAGE) .arg(pages) .arg(start_addr.toText()) .arg(updated); @@ -4356,15 +4357,15 @@ MySqlLeaseMgr::upgradeExtendedInfo4(const LeasePageSize& page_size) { continue; } catch (const std::exception& ex) { // Something when wrong, for instance extract failed. - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE, - DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4_ERROR) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE, + MYSQL_LB_UPGRADE_EXTENDED_INFO4_ERROR) .arg(lease->addr_.toText()) .arg(ex.what()); } } } - LOG_INFO(dhcpsrv_logger, DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4) + LOG_INFO(mysql_lb_logger, MYSQL_LB_UPGRADE_EXTENDED_INFO4) .arg(pages) .arg(updated); @@ -4375,8 +4376,8 @@ Lease6Collection MySqlLeaseMgr::getLeases6ByRelayId(const DUID& relay_id, const IOAddress& lower_bound_address, const LeasePageSize& page_size) { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, - DHCPSRV_MYSQL_GET_RELAYID6) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, + MYSQL_LB_GET_RELAYID6) .arg(page_size.page_size_) .arg(lower_bound_address.toText()) .arg(relay_id.toText()); @@ -4433,8 +4434,8 @@ Lease6Collection MySqlLeaseMgr::getLeases6ByRemoteId(const OptionBuffer& remote_id, const IOAddress& lower_bound_address, const LeasePageSize& page_size) { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, - DHCPSRV_MYSQL_GET_REMOTEID6) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, + MYSQL_LB_GET_REMOTEID6) .arg(page_size.page_size_) .arg(lower_bound_address.toText()) .arg(idToText(remote_id)); @@ -4502,8 +4503,8 @@ MySqlLeaseMgr::upgradeExtendedInfo6(const LeasePageSize& page_size) { size_t updated = 0; IOAddress start_addr = IOAddress::IPV6_ZERO_ADDRESS(); for (;;) { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, - DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6_PAGE) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE_DETAIL, + MYSQL_LB_UPGRADE_EXTENDED_INFO6_PAGE) .arg(pages) .arg(start_addr.toText()) .arg(updated); @@ -4564,15 +4565,15 @@ MySqlLeaseMgr::upgradeExtendedInfo6(const LeasePageSize& page_size) { continue; } catch (const std::exception& ex) { // Something when wrong, for instance extract failed. - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE, - DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6_ERROR) + LOG_DEBUG(mysql_lb_logger, MYSQL_LB_DBG_TRACE, + MYSQL_LB_UPGRADE_EXTENDED_INFO6_ERROR) .arg(lease->addr_.toText()) .arg(ex.what()); } } } - LOG_INFO(dhcpsrv_logger, DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6) + LOG_INFO(mysql_lb_logger, MYSQL_LB_UPGRADE_EXTENDED_INFO6) .arg(pages) .arg(updated); diff --git a/src/hooks/dhcp/pgsql/pgsql_hb_log.cc b/src/hooks/dhcp/pgsql/pgsql_hb_log.cc index 144c6ea39c..a75061cbcd 100644 --- a/src/hooks/dhcp/pgsql/pgsql_hb_log.cc +++ b/src/hooks/dhcp/pgsql/pgsql_hb_log.cc @@ -11,6 +11,13 @@ namespace isc { namespace dhcp { +extern const int PGSQL_HB_DBG_TRACE = isc::log::DBGLVL_TRACE_BASIC; +extern const int PGSQL_HB_DBG_RESULTS = isc::log::DBGLVL_TRACE_BASIC_DATA; +extern const int PGSQL_HB_DBG_TRACE_DETAIL = isc::log::DBGLVL_TRACE_DETAIL; +extern const int PGSQL_HB_DBG_TRACE_DETAIL_DATA = + isc::log::DBGLVL_TRACE_DETAIL_DATA; +extern const int PGSQL_HB_DBG_HOOKS = isc::log::DBGLVL_TRACE_BASIC; + isc::log::Logger pgsql_hb_logger("pgsql-hb-hooks"); } // namespace dhcp diff --git a/src/hooks/dhcp/pgsql/pgsql_hb_log.h b/src/hooks/dhcp/pgsql/pgsql_hb_log.h index b4f314bfd8..007cc274ef 100644 --- a/src/hooks/dhcp/pgsql/pgsql_hb_log.h +++ b/src/hooks/dhcp/pgsql/pgsql_hb_log.h @@ -14,6 +14,43 @@ namespace isc { namespace dhcp { +///@{ +/// @brief PostgreSQL Host Mgr logging levels +/// +/// Defines the levels used to output debug messages in the PostgreSQL Lease Mgr +/// Note that higher numbers equate to more verbose (and detailed) output. + +/// @brief Traces normal operations +/// +/// E.g. sending a query to the database etc. +extern const int PGSQL_HB_DBG_TRACE; + +/// @brief Records the results of the lookups +/// +/// Using the example of tracing queries from the backend database, this will +/// just record the summary results. +extern const int PGSQL_HB_DBG_RESULTS; + +/// @brief Additional information +/// +/// Record detailed tracing. This is generally reserved for tracing access to +/// the lease database. +extern const int PGSQL_HB_DBG_TRACE_DETAIL; + +/// @brief Additional information +/// +/// Record detailed (and verbose) data on the server. +extern const int PGSQL_HB_DBG_TRACE_DETAIL_DATA; + +// Trace hook related operations +extern const int PGSQL_HB_DBG_HOOKS; +///@} + +/// @brief PostgreSQL Host Mgr Logger +/// +/// Define the logger used to log messages. We could define it in multiple +/// modules, but defining in a single module and linking to it saves time and +/// space. extern isc::log::Logger pgsql_hb_logger; } // namespace dhcp diff --git a/src/hooks/dhcp/pgsql/pgsql_hb_messages.cc b/src/hooks/dhcp/pgsql/pgsql_hb_messages.cc index ef2a0c8d7e..8735285ec6 100644 --- a/src/hooks/dhcp/pgsql/pgsql_hb_messages.cc +++ b/src/hooks/dhcp/pgsql/pgsql_hb_messages.cc @@ -1,4 +1,4 @@ -// File created from ../../../../src/hooks/dhcp/pgsql_hb/pgsql_hb_messages.mes +// File created from ../../../../src/hooks/dhcp/pgsql/pgsql_hb_messages.mes #include #include @@ -8,8 +8,15 @@ namespace isc { namespace dhcp { extern const isc::log::MessageID PGSQL_HB_DB = "PGSQL_HB_DB"; +extern const isc::log::MessageID PGSQL_HB_DB_GET_VERSION = "PGSQL_HB_DB_GET_VERSION"; +extern const isc::log::MessageID PGSQL_HB_DB_READONLY = "PGSQL_HB_DB_READONLY"; +extern const isc::log::MessageID PGSQL_HB_DB_RECONNECT_ATTEMPT_FAILED = "PGSQL_HB_DB_RECONNECT_ATTEMPT_FAILED"; +extern const isc::log::MessageID PGSQL_HB_DB_RECONNECT_ATTEMPT_SCHEDULE = "PGSQL_HB_DB_RECONNECT_ATTEMPT_SCHEDULE"; +extern const isc::log::MessageID PGSQL_HB_DB_RECONNECT_FAILED = "PGSQL_HB_DB_RECONNECT_FAILED"; extern const isc::log::MessageID PGSQL_HB_DEINIT_OK = "PGSQL_HB_DEINIT_OK"; extern const isc::log::MessageID PGSQL_HB_INIT_OK = "PGSQL_HB_INIT_OK"; +extern const isc::log::MessageID PGSQL_HB_NO_TLS_SUPPORT = "PGSQL_HB_NO_TLS_SUPPORT"; +extern const isc::log::MessageID PGSQL_HB_TLS_SUPPORT = "PGSQL_HB_TLS_SUPPORT"; } // namespace dhcp } // namespace isc @@ -18,8 +25,15 @@ namespace { const char* values[] = { "PGSQL_HB_DB", "opening PostgreSQL hosts database: %1", + "PGSQL_HB_DB_GET_VERSION", "obtaining schema version information for the PostgreSQL hosts database", + "PGSQL_HB_DB_READONLY", "PostgreSQL host database opened for read access only", + "PGSQL_HB_DB_RECONNECT_ATTEMPT_FAILED", "database reconnect failed: %1", + "PGSQL_HB_DB_RECONNECT_ATTEMPT_SCHEDULE", "scheduling attempt %1 of %2 in %3 milliseconds", + "PGSQL_HB_DB_RECONNECT_FAILED", "maximum number of database reconnect attempts: %1, has been exhausted without success", "PGSQL_HB_DEINIT_OK", "unloading PostgreSQL HB hooks library successful", "PGSQL_HB_INIT_OK", "loading PostgreSQL HB hooks library successful", + "PGSQL_HB_NO_TLS_SUPPORT", "Attempt to configure TLS (unsupported for PostgreSQL): %1", + "PGSQL_HB_TLS_SUPPORT", "Attempt to configure TLS: %1", NULL }; diff --git a/src/hooks/dhcp/pgsql/pgsql_hb_messages.h b/src/hooks/dhcp/pgsql/pgsql_hb_messages.h index 6fe9af73cd..a4afd26722 100644 --- a/src/hooks/dhcp/pgsql/pgsql_hb_messages.h +++ b/src/hooks/dhcp/pgsql/pgsql_hb_messages.h @@ -1,4 +1,4 @@ -// File created from ../../../../src/hooks/dhcp/pgsql_hb/pgsql_hb_messages.mes +// File created from ../../../../src/hooks/dhcp/pgsql/pgsql_hb_messages.mes #ifndef PGSQL_HB_MESSAGES_H #define PGSQL_HB_MESSAGES_H @@ -9,8 +9,15 @@ namespace isc { namespace dhcp { extern const isc::log::MessageID PGSQL_HB_DB; +extern const isc::log::MessageID PGSQL_HB_DB_GET_VERSION; +extern const isc::log::MessageID PGSQL_HB_DB_READONLY; +extern const isc::log::MessageID PGSQL_HB_DB_RECONNECT_ATTEMPT_FAILED; +extern const isc::log::MessageID PGSQL_HB_DB_RECONNECT_ATTEMPT_SCHEDULE; +extern const isc::log::MessageID PGSQL_HB_DB_RECONNECT_FAILED; extern const isc::log::MessageID PGSQL_HB_DEINIT_OK; extern const isc::log::MessageID PGSQL_HB_INIT_OK; +extern const isc::log::MessageID PGSQL_HB_NO_TLS_SUPPORT; +extern const isc::log::MessageID PGSQL_HB_TLS_SUPPORT; } // namespace dhcp } // namespace isc diff --git a/src/hooks/dhcp/pgsql/pgsql_hb_messages.mes b/src/hooks/dhcp/pgsql/pgsql_hb_messages.mes index d89f56bda2..ccc16a8eff 100644 --- a/src/hooks/dhcp/pgsql/pgsql_hb_messages.mes +++ b/src/hooks/dhcp/pgsql/pgsql_hb_messages.mes @@ -20,3 +20,38 @@ library has been unloaded successfully. % PGSQL_HB_INIT_OK loading PostgreSQL HB hooks library successful This informational message indicates that the PostgreSQL Host Backend hooks library has been loaded successfully. Enjoy! + +% PGSQL_HB_DB_GET_VERSION obtaining schema version information for the PostgreSQL hosts database +Logged at debug log level 50. +A debug message issued when the server is about to obtain schema version +information from the PostgreSQL hosts database. + +% PGSQL_HB_DB_READONLY PostgreSQL host database opened for read access only +This informational message is issued when the user has configured the PostgreSQL +database in read-only mode. Kea will not be able to insert or modify +host reservations but will be able to retrieve existing ones and +assign them to the clients communicating with the server. + +% PGSQL_HB_DB_RECONNECT_ATTEMPT_FAILED database reconnect failed: %1 +An error message issued when an attempt to reconnect has failed. + +% PGSQL_HB_DB_RECONNECT_ATTEMPT_SCHEDULE scheduling attempt %1 of %2 in %3 milliseconds +An info message issued when the server is scheduling the next attempt to reconnect +to the database. This occurs when the server has lost database connectivity and +is attempting to reconnect automatically. + +% PGSQL_HB_DB_RECONNECT_FAILED maximum number of database reconnect attempts: %1, has been exhausted without success +An error message issued when the server failed to reconnect. Loss of connectivity +is typically a network or database server issue. + +% PGSQL_HB_NO_TLS_SUPPORT Attempt to configure TLS (unsupported for PostgreSQL): %1 +This error message is printed when TLS support was required in the Kea +configuration: Kea was built with this feature disabled for PostgreSQL. +The parameters of the connection are logged. + +% PGSQL_HB_TLS_SUPPORT Attempt to configure TLS: %1 +This informational message is printed when TLS support was required in +the Kea configuration: The TLS support in PostgreSQL will be initialized but +its configuration is fully managed outside the C API. +The parameters of the connection are logged. + diff --git a/src/hooks/dhcp/pgsql/pgsql_host_data_source.cc b/src/hooks/dhcp/pgsql/pgsql_host_data_source.cc index efdf1eef50..4201241151 100644 --- a/src/hooks/dhcp/pgsql/pgsql_host_data_source.cc +++ b/src/hooks/dhcp/pgsql/pgsql_host_data_source.cc @@ -2324,13 +2324,13 @@ PgSqlHostDataSourceImpl::PgSqlHostDataSourceImpl(const DatabaseConnection::Param #ifdef HAVE_PGSQL_SSL if ((tls > 0) && !PgSqlConnection::warned_about_tls) { PgSqlConnection::warned_about_tls = true; - LOG_INFO(dhcpsrv_logger, DHCPSRV_PGSQL_TLS_SUPPORT) + LOG_INFO(pgsql_hb_logger, PGSQL_HB_TLS_SUPPORT) .arg(DatabaseConnection::redactedAccessString(parameters_)); PQinitSSL(1); } #else if (tls > 0) { - LOG_ERROR(dhcpsrv_logger, DHCPSRV_PGSQL_NO_TLS_SUPPORT) + LOG_ERROR(pgsql_hb_logger, PGSQL_HB_NO_TLS_SUPPORT) .arg(DatabaseConnection::redactedAccessString(parameters_)); isc_throw(DbOpenError, "Attempt to configure TLS for PostgreSQL " << "backend (built with this feature disabled)"); @@ -2376,7 +2376,7 @@ PgSqlHostDataSourceImpl::createContext() const { ctx->conn_.prepareStatements(tagged_statements.begin() + WRITE_STMTS_BEGIN, tagged_statements.end()); } else { - LOG_INFO(dhcpsrv_logger, DHCPSRV_PGSQL_HOST_DB_READONLY); + LOG_INFO(pgsql_hb_logger, PGSQL_HB_DB_READONLY); } ctx->host_ipv4_exchange_.reset(new PgSqlHostWithOptionsExchange(PgSqlHostWithOptionsExchange::DHCP4_ONLY)); @@ -2419,7 +2419,7 @@ PgSqlHostDataSourceImpl::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) { } reopened = true; } catch (const std::exception& ex) { - LOG_ERROR(dhcpsrv_logger, DHCPSRV_PGSQL_HOST_DB_RECONNECT_ATTEMPT_FAILED) + LOG_ERROR(pgsql_hb_logger, PGSQL_HB_DB_RECONNECT_ATTEMPT_FAILED) .arg(ex.what()); } @@ -2436,7 +2436,7 @@ PgSqlHostDataSourceImpl::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) { } else { if (!db_reconnect_ctl->checkRetries()) { // We're out of retries, log it and initiate shutdown. - LOG_ERROR(dhcpsrv_logger, DHCPSRV_PGSQL_HOST_DB_RECONNECT_FAILED) + LOG_ERROR(pgsql_hb_logger, PGSQL_HB_DB_RECONNECT_FAILED) .arg(db_reconnect_ctl->maxRetries()); // Cancel the timer. @@ -2449,7 +2449,7 @@ PgSqlHostDataSourceImpl::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) { return (false); } - LOG_INFO(dhcpsrv_logger, DHCPSRV_PGSQL_HOST_DB_RECONNECT_ATTEMPT_SCHEDULE) + LOG_INFO(pgsql_hb_logger, PGSQL_HB_DB_RECONNECT_ATTEMPT_SCHEDULE) .arg(db_reconnect_ctl->maxRetries() - db_reconnect_ctl->retriesLeft() + 1) .arg(db_reconnect_ctl->maxRetries()) .arg(db_reconnect_ctl->retryInterval()); @@ -2655,7 +2655,7 @@ PgSqlHostDataSourceImpl::getHost(PgSqlHostContextPtr& ctx, std::pair PgSqlHostDataSourceImpl::getVersion(const std::string& timer_name) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_HOST_DB_GET_VERSION); + LOG_DEBUG(pgsql_hb_logger, PGSQL_HB_DBG_TRACE_DETAIL, PGSQL_HB_DB_GET_VERSION); IOServiceAccessorPtr ac(new IOServiceAccessor(&DatabaseConnection::getIOService)); DbCallback cb(&PgSqlHostDataSourceImpl::dbReconnect); diff --git a/src/hooks/dhcp/pgsql/pgsql_lb_log.cc b/src/hooks/dhcp/pgsql/pgsql_lb_log.cc index 00d3319f43..ae3c022d60 100644 --- a/src/hooks/dhcp/pgsql/pgsql_lb_log.cc +++ b/src/hooks/dhcp/pgsql/pgsql_lb_log.cc @@ -11,6 +11,13 @@ namespace isc { namespace dhcp { +extern const int PGSQL_LB_DBG_TRACE = isc::log::DBGLVL_TRACE_BASIC; +extern const int PGSQL_LB_DBG_RESULTS = isc::log::DBGLVL_TRACE_BASIC_DATA; +extern const int PGSQL_LB_DBG_TRACE_DETAIL = isc::log::DBGLVL_TRACE_DETAIL; +extern const int PGSQL_LB_DBG_TRACE_DETAIL_DATA = + isc::log::DBGLVL_TRACE_DETAIL_DATA; +extern const int PGSQL_LB_DBG_HOOKS = isc::log::DBGLVL_TRACE_BASIC; + isc::log::Logger pgsql_lb_logger("pgsql-lb-hooks"); } // namespace dhcp diff --git a/src/hooks/dhcp/pgsql/pgsql_lb_log.h b/src/hooks/dhcp/pgsql/pgsql_lb_log.h index 7cff0c4fcb..faf8ce3585 100644 --- a/src/hooks/dhcp/pgsql/pgsql_lb_log.h +++ b/src/hooks/dhcp/pgsql/pgsql_lb_log.h @@ -14,6 +14,43 @@ namespace isc { namespace dhcp { +///@{ +/// @brief PostgreSQL Lease Mgr logging levels +/// +/// Defines the levels used to output debug messages in the PostgreSQL Lease Mgr +/// Note that higher numbers equate to more verbose (and detailed) output. + +/// @brief Traces normal operations +/// +/// E.g. sending a query to the database etc. +extern const int PGSQL_LB_DBG_TRACE; + +/// @brief Records the results of the lookups +/// +/// Using the example of tracing queries from the backend database, this will +/// just record the summary results. +extern const int PGSQL_LB_DBG_RESULTS; + +/// @brief Additional information +/// +/// Record detailed tracing. This is generally reserved for tracing access to +/// the lease database. +extern const int PGSQL_LB_DBG_TRACE_DETAIL; + +/// @brief Additional information +/// +/// Record detailed (and verbose) data on the server. +extern const int PGSQL_LB_DBG_TRACE_DETAIL_DATA; + +// Trace hook related operations +extern const int PGSQL_LB_DBG_HOOKS; +///@} + +/// @brief PostgreSQL Lease Mgr Logger +/// +/// Define the logger used to log messages. We could define it in multiple +/// modules, but defining in a single module and linking to it saves time and +/// space. extern isc::log::Logger pgsql_lb_logger; } // namespace dhcp diff --git a/src/hooks/dhcp/pgsql/pgsql_lb_messages.cc b/src/hooks/dhcp/pgsql/pgsql_lb_messages.cc index 7fb161f8f2..50416b3d67 100644 --- a/src/hooks/dhcp/pgsql/pgsql_lb_messages.cc +++ b/src/hooks/dhcp/pgsql/pgsql_lb_messages.cc @@ -1,4 +1,4 @@ -// File created from ../../../../src/hooks/dhcp/pgsql_lb/pgsql_lb_messages.mes +// File created from ../../../../src/hooks/dhcp/pgsql/pgsql_lb_messages.mes #include #include @@ -7,9 +7,56 @@ namespace isc { namespace dhcp { +extern const isc::log::MessageID PGSQL_LB_ADD_ADDR4 = "PGSQL_LB_ADD_ADDR4"; +extern const isc::log::MessageID PGSQL_LB_ADD_ADDR6 = "PGSQL_LB_ADD_ADDR6"; +extern const isc::log::MessageID PGSQL_LB_COMMIT = "PGSQL_LB_COMMIT"; extern const isc::log::MessageID PGSQL_LB_DB = "PGSQL_LB_DB"; +extern const isc::log::MessageID PGSQL_LB_DB_RECONNECT_ATTEMPT_FAILED = "PGSQL_LB_DB_RECONNECT_ATTEMPT_FAILED"; +extern const isc::log::MessageID PGSQL_LB_DB_RECONNECT_ATTEMPT_SCHEDULE = "PGSQL_LB_DB_RECONNECT_ATTEMPT_SCHEDULE"; +extern const isc::log::MessageID PGSQL_LB_DB_RECONNECT_FAILED = "PGSQL_LB_DB_RECONNECT_FAILED"; extern const isc::log::MessageID PGSQL_LB_DEINIT_OK = "PGSQL_LB_DEINIT_OK"; +extern const isc::log::MessageID PGSQL_LB_DELETE_ADDR4 = "PGSQL_LB_DELETE_ADDR4"; +extern const isc::log::MessageID PGSQL_LB_DELETE_ADDR6 = "PGSQL_LB_DELETE_ADDR6"; +extern const isc::log::MessageID PGSQL_LB_DELETE_EXPIRED_RECLAIMED4 = "PGSQL_LB_DELETE_EXPIRED_RECLAIMED4"; +extern const isc::log::MessageID PGSQL_LB_DELETE_EXPIRED_RECLAIMED6 = "PGSQL_LB_DELETE_EXPIRED_RECLAIMED6"; +extern const isc::log::MessageID PGSQL_LB_GET4 = "PGSQL_LB_GET4"; +extern const isc::log::MessageID PGSQL_LB_GET6 = "PGSQL_LB_GET6"; +extern const isc::log::MessageID PGSQL_LB_GET_ADDR4 = "PGSQL_LB_GET_ADDR4"; +extern const isc::log::MessageID PGSQL_LB_GET_ADDR6 = "PGSQL_LB_GET_ADDR6"; +extern const isc::log::MessageID PGSQL_LB_GET_CLIENTID = "PGSQL_LB_GET_CLIENTID"; +extern const isc::log::MessageID PGSQL_LB_GET_DUID = "PGSQL_LB_GET_DUID"; +extern const isc::log::MessageID PGSQL_LB_GET_EXPIRED4 = "PGSQL_LB_GET_EXPIRED4"; +extern const isc::log::MessageID PGSQL_LB_GET_EXPIRED6 = "PGSQL_LB_GET_EXPIRED6"; +extern const isc::log::MessageID PGSQL_LB_GET_HOSTNAME4 = "PGSQL_LB_GET_HOSTNAME4"; +extern const isc::log::MessageID PGSQL_LB_GET_HOSTNAME6 = "PGSQL_LB_GET_HOSTNAME6"; +extern const isc::log::MessageID PGSQL_LB_GET_HWADDR = "PGSQL_LB_GET_HWADDR"; +extern const isc::log::MessageID PGSQL_LB_GET_IAID_DUID = "PGSQL_LB_GET_IAID_DUID"; +extern const isc::log::MessageID PGSQL_LB_GET_IAID_SUBID_DUID = "PGSQL_LB_GET_IAID_SUBID_DUID"; +extern const isc::log::MessageID PGSQL_LB_GET_PAGE4 = "PGSQL_LB_GET_PAGE4"; +extern const isc::log::MessageID PGSQL_LB_GET_PAGE6 = "PGSQL_LB_GET_PAGE6"; +extern const isc::log::MessageID PGSQL_LB_GET_RELAYID4 = "PGSQL_LB_GET_RELAYID4"; +extern const isc::log::MessageID PGSQL_LB_GET_RELAYID6 = "PGSQL_LB_GET_RELAYID6"; +extern const isc::log::MessageID PGSQL_LB_GET_REMOTEID4 = "PGSQL_LB_GET_REMOTEID4"; +extern const isc::log::MessageID PGSQL_LB_GET_REMOTEID6 = "PGSQL_LB_GET_REMOTEID6"; +extern const isc::log::MessageID PGSQL_LB_GET_SUBID4 = "PGSQL_LB_GET_SUBID4"; +extern const isc::log::MessageID PGSQL_LB_GET_SUBID6 = "PGSQL_LB_GET_SUBID6"; +extern const isc::log::MessageID PGSQL_LB_GET_SUBID_CLIENTID = "PGSQL_LB_GET_SUBID_CLIENTID"; +extern const isc::log::MessageID PGSQL_LB_GET_SUBID_HWADDR = "PGSQL_LB_GET_SUBID_HWADDR"; +extern const isc::log::MessageID PGSQL_LB_GET_SUBID_PAGE6 = "PGSQL_LB_GET_SUBID_PAGE6"; +extern const isc::log::MessageID PGSQL_LB_GET_VERSION = "PGSQL_LB_GET_VERSION"; extern const isc::log::MessageID PGSQL_LB_INIT_OK = "PGSQL_LB_INIT_OK"; +extern const isc::log::MessageID PGSQL_LB_NEGATIVE_LEASES_STAT = "PGSQL_LB_NEGATIVE_LEASES_STAT"; +extern const isc::log::MessageID PGSQL_LB_NO_TLS_SUPPORT = "PGSQL_LB_NO_TLS_SUPPORT"; +extern const isc::log::MessageID PGSQL_LB_ROLLBACK = "PGSQL_LB_ROLLBACK"; +extern const isc::log::MessageID PGSQL_LB_TLS_SUPPORT = "PGSQL_LB_TLS_SUPPORT"; +extern const isc::log::MessageID PGSQL_LB_UPDATE_ADDR4 = "PGSQL_LB_UPDATE_ADDR4"; +extern const isc::log::MessageID PGSQL_LB_UPDATE_ADDR6 = "PGSQL_LB_UPDATE_ADDR6"; +extern const isc::log::MessageID PGSQL_LB_UPGRADE_EXTENDED_INFO4 = "PGSQL_LB_UPGRADE_EXTENDED_INFO4"; +extern const isc::log::MessageID PGSQL_LB_UPGRADE_EXTENDED_INFO4_ERROR = "PGSQL_LB_UPGRADE_EXTENDED_INFO4_ERROR"; +extern const isc::log::MessageID PGSQL_LB_UPGRADE_EXTENDED_INFO4_PAGE = "PGSQL_LB_UPGRADE_EXTENDED_INFO4_PAGE"; +extern const isc::log::MessageID PGSQL_LB_UPGRADE_EXTENDED_INFO6 = "PGSQL_LB_UPGRADE_EXTENDED_INFO6"; +extern const isc::log::MessageID PGSQL_LB_UPGRADE_EXTENDED_INFO6_ERROR = "PGSQL_LB_UPGRADE_EXTENDED_INFO6_ERROR"; +extern const isc::log::MessageID PGSQL_LB_UPGRADE_EXTENDED_INFO6_PAGE = "PGSQL_LB_UPGRADE_EXTENDED_INFO6_PAGE"; } // namespace dhcp } // namespace isc @@ -17,9 +64,56 @@ extern const isc::log::MessageID PGSQL_LB_INIT_OK = "PGSQL_LB_INIT_OK"; namespace { const char* values[] = { + "PGSQL_LB_ADD_ADDR4", "adding IPv4 lease with address %1", + "PGSQL_LB_ADD_ADDR6", "adding IPv6 lease with address %1, lease type %2", + "PGSQL_LB_COMMIT", "committing to PostgreSQL database", "PGSQL_LB_DB", "opening PostgreSQL lease database: %1", + "PGSQL_LB_DB_RECONNECT_ATTEMPT_FAILED", "database reconnect failed: %1", + "PGSQL_LB_DB_RECONNECT_ATTEMPT_SCHEDULE", "scheduling attempt %1 of %2 in %3 milliseconds", + "PGSQL_LB_DB_RECONNECT_FAILED", "maximum number of database reconnect attempts: %1, has been exhausted without success", "PGSQL_LB_DEINIT_OK", "unloading PostgreSQL LB hooks library successful", + "PGSQL_LB_DELETE_ADDR4", "deleting lease for address %1", + "PGSQL_LB_DELETE_ADDR6", "deleting lease for address %1", + "PGSQL_LB_DELETE_EXPIRED_RECLAIMED4", "deleting reclaimed IPv4 leases that expired more than %1 seconds ago", + "PGSQL_LB_DELETE_EXPIRED_RECLAIMED6", "deleting reclaimed IPv6 leases that expired more than %1 seconds ago", + "PGSQL_LB_GET4", "obtaining all IPv4 leases", + "PGSQL_LB_GET6", "obtaining all IPv6 leases", + "PGSQL_LB_GET_ADDR4", "obtaining IPv4 lease for address %1", + "PGSQL_LB_GET_ADDR6", "obtaining IPv6 lease for address %1 (lease type %2)", + "PGSQL_LB_GET_CLIENTID", "obtaining IPv4 leases for client ID %1", + "PGSQL_LB_GET_DUID", "obtaining IPv6 leases for DUID %1,", + "PGSQL_LB_GET_EXPIRED4", "obtaining maximum %1 of expired IPv4 leases", + "PGSQL_LB_GET_EXPIRED6", "obtaining maximum %1 of expired IPv6 leases", + "PGSQL_LB_GET_HOSTNAME4", "obtaining IPv4 leases for hostname %1", + "PGSQL_LB_GET_HOSTNAME6", "obtaining IPv6 leases for hostname %1", + "PGSQL_LB_GET_HWADDR", "obtaining IPv4 leases for hardware address %1", + "PGSQL_LB_GET_IAID_DUID", "obtaining IPv4 leases for IAID %1 and DUID %2, lease type %3", + "PGSQL_LB_GET_IAID_SUBID_DUID", "obtaining IPv4 leases for IAID %1, Subnet ID %2, DUID %3, and lease type %4", + "PGSQL_LB_GET_PAGE4", "obtaining at most %1 IPv4 leases starting from address %2", + "PGSQL_LB_GET_PAGE6", "obtaining at most %1 IPv6 leases starting from address %2", + "PGSQL_LB_GET_RELAYID4", "obtaining at most %1 IPv4 leases starting from address %2 with relay id %3 and cltt between %4 and %5", + "PGSQL_LB_GET_RELAYID6", "obtaining at most %1 IPv6 leases starting from address %2 with relay id %3", + "PGSQL_LB_GET_REMOTEID4", "obtaining at most %1 IPv4 leases starting from address %2 with remote id %3 and cltt between %4 and %5", + "PGSQL_LB_GET_REMOTEID6", "obtaining at most %1 IPv6 leases starting from address %2 with remote id %3", + "PGSQL_LB_GET_SUBID4", "obtaining IPv4 leases for subnet ID %1", + "PGSQL_LB_GET_SUBID6", "obtaining IPv6 leases for subnet ID %1", + "PGSQL_LB_GET_SUBID_CLIENTID", "obtaining IPv4 lease for subnet ID %1 and client ID %2", + "PGSQL_LB_GET_SUBID_HWADDR", "obtaining IPv4 lease for subnet ID %1 and hardware address %2", + "PGSQL_LB_GET_SUBID_PAGE6", "obtaining at most %1 IPv6 leases starting from address %2 for subnet ID %3", + "PGSQL_LB_GET_VERSION", "obtaining schema version information", "PGSQL_LB_INIT_OK", "loading PostgreSQL LB hooks library successful", + "PGSQL_LB_NEGATIVE_LEASES_STAT", "recount of leases returned a negative value", + "PGSQL_LB_NO_TLS_SUPPORT", "Attempt to configure TLS (unsupported for PostgreSQL): %1", + "PGSQL_LB_ROLLBACK", "rolling back PostgreSQL database", + "PGSQL_LB_TLS_SUPPORT", "Attempt to configure TLS: %1", + "PGSQL_LB_UPDATE_ADDR4", "updating IPv4 lease for address %1", + "PGSQL_LB_UPDATE_ADDR6", "updating IPv6 lease for address %1, lease type %2", + "PGSQL_LB_UPGRADE_EXTENDED_INFO4", "upgrading IPv4 leases done in %1 pages with %2 updated leases", + "PGSQL_LB_UPGRADE_EXTENDED_INFO4_ERROR", "upgrading extending info for IPv4 lease at %1 failed with %2", + "PGSQL_LB_UPGRADE_EXTENDED_INFO4_PAGE", "upgrading IPv4 lease extended info at page %1 starting at %2 (updated %3)", + "PGSQL_LB_UPGRADE_EXTENDED_INFO6", "upgrading IPv6 leases done in %1 pages with %2 updated leases", + "PGSQL_LB_UPGRADE_EXTENDED_INFO6_ERROR", "upgrading extending info for IPv6 lease at %1 failed with %2", + "PGSQL_LB_UPGRADE_EXTENDED_INFO6_PAGE", "upgrading IPv6 lease extended info at page %1 starting at %2 (updated %3)", NULL }; diff --git a/src/hooks/dhcp/pgsql/pgsql_lb_messages.h b/src/hooks/dhcp/pgsql/pgsql_lb_messages.h index 0cb8977dd7..761ef2ac22 100644 --- a/src/hooks/dhcp/pgsql/pgsql_lb_messages.h +++ b/src/hooks/dhcp/pgsql/pgsql_lb_messages.h @@ -1,4 +1,4 @@ -// File created from ../../../../src/hooks/dhcp/pgsql_lb/pgsql_lb_messages.mes +// File created from ../../../../src/hooks/dhcp/pgsql/pgsql_lb_messages.mes #ifndef PGSQL_LB_MESSAGES_H #define PGSQL_LB_MESSAGES_H @@ -8,9 +8,56 @@ namespace isc { namespace dhcp { +extern const isc::log::MessageID PGSQL_LB_ADD_ADDR4; +extern const isc::log::MessageID PGSQL_LB_ADD_ADDR6; +extern const isc::log::MessageID PGSQL_LB_COMMIT; extern const isc::log::MessageID PGSQL_LB_DB; +extern const isc::log::MessageID PGSQL_LB_DB_RECONNECT_ATTEMPT_FAILED; +extern const isc::log::MessageID PGSQL_LB_DB_RECONNECT_ATTEMPT_SCHEDULE; +extern const isc::log::MessageID PGSQL_LB_DB_RECONNECT_FAILED; extern const isc::log::MessageID PGSQL_LB_DEINIT_OK; +extern const isc::log::MessageID PGSQL_LB_DELETE_ADDR4; +extern const isc::log::MessageID PGSQL_LB_DELETE_ADDR6; +extern const isc::log::MessageID PGSQL_LB_DELETE_EXPIRED_RECLAIMED4; +extern const isc::log::MessageID PGSQL_LB_DELETE_EXPIRED_RECLAIMED6; +extern const isc::log::MessageID PGSQL_LB_GET4; +extern const isc::log::MessageID PGSQL_LB_GET6; +extern const isc::log::MessageID PGSQL_LB_GET_ADDR4; +extern const isc::log::MessageID PGSQL_LB_GET_ADDR6; +extern const isc::log::MessageID PGSQL_LB_GET_CLIENTID; +extern const isc::log::MessageID PGSQL_LB_GET_DUID; +extern const isc::log::MessageID PGSQL_LB_GET_EXPIRED4; +extern const isc::log::MessageID PGSQL_LB_GET_EXPIRED6; +extern const isc::log::MessageID PGSQL_LB_GET_HOSTNAME4; +extern const isc::log::MessageID PGSQL_LB_GET_HOSTNAME6; +extern const isc::log::MessageID PGSQL_LB_GET_HWADDR; +extern const isc::log::MessageID PGSQL_LB_GET_IAID_DUID; +extern const isc::log::MessageID PGSQL_LB_GET_IAID_SUBID_DUID; +extern const isc::log::MessageID PGSQL_LB_GET_PAGE4; +extern const isc::log::MessageID PGSQL_LB_GET_PAGE6; +extern const isc::log::MessageID PGSQL_LB_GET_RELAYID4; +extern const isc::log::MessageID PGSQL_LB_GET_RELAYID6; +extern const isc::log::MessageID PGSQL_LB_GET_REMOTEID4; +extern const isc::log::MessageID PGSQL_LB_GET_REMOTEID6; +extern const isc::log::MessageID PGSQL_LB_GET_SUBID4; +extern const isc::log::MessageID PGSQL_LB_GET_SUBID6; +extern const isc::log::MessageID PGSQL_LB_GET_SUBID_CLIENTID; +extern const isc::log::MessageID PGSQL_LB_GET_SUBID_HWADDR; +extern const isc::log::MessageID PGSQL_LB_GET_SUBID_PAGE6; +extern const isc::log::MessageID PGSQL_LB_GET_VERSION; extern const isc::log::MessageID PGSQL_LB_INIT_OK; +extern const isc::log::MessageID PGSQL_LB_NEGATIVE_LEASES_STAT; +extern const isc::log::MessageID PGSQL_LB_NO_TLS_SUPPORT; +extern const isc::log::MessageID PGSQL_LB_ROLLBACK; +extern const isc::log::MessageID PGSQL_LB_TLS_SUPPORT; +extern const isc::log::MessageID PGSQL_LB_UPDATE_ADDR4; +extern const isc::log::MessageID PGSQL_LB_UPDATE_ADDR6; +extern const isc::log::MessageID PGSQL_LB_UPGRADE_EXTENDED_INFO4; +extern const isc::log::MessageID PGSQL_LB_UPGRADE_EXTENDED_INFO4_ERROR; +extern const isc::log::MessageID PGSQL_LB_UPGRADE_EXTENDED_INFO4_PAGE; +extern const isc::log::MessageID PGSQL_LB_UPGRADE_EXTENDED_INFO6; +extern const isc::log::MessageID PGSQL_LB_UPGRADE_EXTENDED_INFO6_ERROR; +extern const isc::log::MessageID PGSQL_LB_UPGRADE_EXTENDED_INFO6_PAGE; } // namespace dhcp } // namespace isc diff --git a/src/hooks/dhcp/pgsql/pgsql_lb_messages.mes b/src/hooks/dhcp/pgsql/pgsql_lb_messages.mes index 52cbb0758c..e526212aaa 100644 --- a/src/hooks/dhcp/pgsql/pgsql_lb_messages.mes +++ b/src/hooks/dhcp/pgsql/pgsql_lb_messages.mes @@ -7,6 +7,7 @@ $NAMESPACE isc::dhcp % PGSQL_LB_DB opening PostgreSQL lease database: %1 +Logged at debug log level 50. This informational message is logged when a DHCP server (either V4 or V6) is about to open a PostgreSQL lease database. The parameters of the connection including database name and username needed to access it @@ -19,3 +20,258 @@ library has been unloaded successfully. % PGSQL_LB_INIT_OK loading PostgreSQL LB hooks library successful This informational message indicates that the PostgreSQL Lease Backend hooks library has been loaded successfully. Enjoy! + +% PGSQL_LB_ADD_ADDR4 adding IPv4 lease with address %1 +Logged at debug log level 50. +A debug message issued when the server is about to add an IPv4 lease +with the specified address to the PostgreSQL backend database. + +% PGSQL_LB_ADD_ADDR6 adding IPv6 lease with address %1, lease type %2 +Logged at debug log level 50. +A debug message issued when the server is about to add an IPv6 lease +with the specified address to the PostgreSQL backend database. + +% PGSQL_LB_COMMIT committing to PostgreSQL database +Logged at debug log level 50. +The code has issued a commit call. All outstanding transactions will be +committed to the database. Note that depending on the PostgreSQL settings, +the commit may not include a write to disk. + +% PGSQL_LB_DELETE_ADDR4 deleting lease for address %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to delete a lease for +the specified address from the PostgreSQL database for the specified address. + +% PGSQL_LB_DELETE_ADDR6 deleting lease for address %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to delete a lease for +the specified address from the PostgreSQL database for the specified address. + +% PGSQL_LB_DELETE_EXPIRED_RECLAIMED4 deleting reclaimed IPv4 leases that expired more than %1 seconds ago +Logged at debug log level 50. +A debug message issued when the server is removing reclaimed DHCPv4 +leases which have expired longer than a specified period of time. +The argument is the amount of time Kea waits after a reclaimed +lease expires before considering its removal. + +% PGSQL_LB_DELETE_EXPIRED_RECLAIMED6 deleting reclaimed IPv6 leases that expired more than %1 seconds ago +Logged at debug log level 50. +A debug message issued when the server is removing reclaimed DHCPv6 +leases which have expired longer than a specified period of time. +The argument is the amount of time Kea waits after a reclaimed +lease expires before considering its removal. + +% PGSQL_LB_GET4 obtaining all IPv4 leases +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain all IPv4 +leases from the PostgreSQL database. + +% PGSQL_LB_GET6 obtaining all IPv6 leases +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain all IPv6 +leases from the PostgreSQL database. + +% PGSQL_LB_GET_ADDR4 obtaining IPv4 lease for address %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain an IPv4 +lease from the PostgreSQL database for the specified address. + +% PGSQL_LB_GET_ADDR6 obtaining IPv6 lease for address %1 (lease type %2) +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain an IPv6 +lease from the PostgreSQL database for the specified address. + +% PGSQL_LB_GET_CLIENTID obtaining IPv4 leases for client ID %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a set +of IPv4 leases from the PostgreSQL database for a client with the specified +client identification. + +% PGSQL_LB_GET_DUID obtaining IPv6 leases for DUID %1, +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a set of IPv6 +leases from the PostgreSQL database for a client with the specified DUID (DHCP Unique Identifier). + +% PGSQL_LB_GET_EXPIRED4 obtaining maximum %1 of expired IPv4 leases +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain expired +IPv4 leases to reclaim them. The maximum number of leases to be retrieved +is logged in the message. + +% PGSQL_LB_GET_EXPIRED6 obtaining maximum %1 of expired IPv6 leases +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain expired +IPv6 leases to reclaim them. The maximum number of leases to be retrieved +is logged in the message. + +% PGSQL_LB_GET_HOSTNAME4 obtaining IPv4 leases for hostname %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a set +of IPv4 leases from the PostgreSQL database for a client with the specified +hostname. + +% PGSQL_LB_GET_HOSTNAME6 obtaining IPv6 leases for hostname %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a set +of IPv6 leases from the PostgreSQL database for a client with the specified +hostname. + +% PGSQL_LB_GET_HWADDR obtaining IPv4 leases for hardware address %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a set +of IPv4 leases from the PostgreSQL database for a client with the specified +hardware address. + +% PGSQL_LB_GET_IAID_DUID obtaining IPv4 leases for IAID %1 and DUID %2, lease type %3 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a set of IPv6 +leases from the PostgreSQL database for a client with the specified IAID +(Identity Association ID) and DUID (DHCP Unique Identifier). + +% PGSQL_LB_GET_IAID_SUBID_DUID obtaining IPv4 leases for IAID %1, Subnet ID %2, DUID %3, and lease type %4 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain an IPv6 +lease from the PostgreSQL database for a client with the specified IAID +(Identity Association ID), Subnet ID and DUID (DHCP Unique Identifier). + +% PGSQL_LB_GET_PAGE4 obtaining at most %1 IPv4 leases starting from address %2 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a page +of leases beginning with the specified address. + +% PGSQL_LB_GET_PAGE6 obtaining at most %1 IPv6 leases starting from address %2 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a page +of leases beginning with the specified address. + +% PGSQL_LB_GET_RELAYID4 obtaining at most %1 IPv4 leases starting from address %2 with relay id %3 and cltt between %4 and %5 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a page of +IPv4 leases beginning with the specified address with a relay id and client +transaction time between start and end dates. + +% PGSQL_LB_GET_RELAYID6 obtaining at most %1 IPv6 leases starting from address %2 with relay id %3 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a page of +IPv6 leases beginning with the specified address with a relay id. + +% PGSQL_LB_GET_REMOTEID4 obtaining at most %1 IPv4 leases starting from address %2 with remote id %3 and cltt between %4 and %5 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a page of +IPv4 leases beginning with the specified address with a remote id and client +transaction time between start and end dates. + +% PGSQL_LB_GET_REMOTEID6 obtaining at most %1 IPv6 leases starting from address %2 with remote id %3 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a page of +IPv6 leases beginning with the specified address with a remote id. + +% PGSQL_LB_GET_SUBID4 obtaining IPv4 leases for subnet ID %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain all IPv4 +leases for a given subnet identifier from the PostgreSQL database. + +% PGSQL_LB_GET_SUBID6 obtaining IPv6 leases for subnet ID %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain all IPv6 +leases for a given subnet identifier from the PostgreSQL database. + +% PGSQL_LB_GET_SUBID_CLIENTID obtaining IPv4 lease for subnet ID %1 and client ID %2 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain an IPv4 +lease from the PostgreSQL database for a client with the specified subnet ID +and client ID. + +% PGSQL_LB_GET_SUBID_HWADDR obtaining IPv4 lease for subnet ID %1 and hardware address %2 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain an IPv4 +lease from the PostgreSQL database for a client with the specified subnet ID +and hardware address. + +% PGSQL_LB_GET_SUBID_PAGE6 obtaining at most %1 IPv6 leases starting from address %2 for subnet ID %3 +Logged at debug log level 50. +A debug message issued when the server is attempting to obtain a page of +IPv6 leases from the PostgreSQL database beginning with the specified address +for the specified subnet identifier. + +% PGSQL_LB_GET_VERSION obtaining schema version information +Logged at debug log level 50. +A debug message issued when the server is about to obtain schema version +information from the PostgreSQL database. + +% PGSQL_LB_DB_RECONNECT_ATTEMPT_FAILED database reconnect failed: %1 +An error message issued when an attempt to reconnect has failed. + +% PGSQL_LB_DB_RECONNECT_ATTEMPT_SCHEDULE scheduling attempt %1 of %2 in %3 milliseconds +An info message issued when the server is scheduling the next attempt to reconnect +to the database. This occurs when the server has lost database connectivity and +is attempting to reconnect automatically. + +% PGSQL_LB_DB_RECONNECT_FAILED maximum number of database reconnect attempts: %1, has been exhausted without success +An error message issued when the server failed to reconnect. Loss of connectivity +is typically a network or database server issue. + +% PGSQL_LB_NEGATIVE_LEASES_STAT recount of leases returned a negative value +This warning message is issued when the recount of leases using counters +in the PostgreSQL database returned a negative value. This shows a problem +which can be fixed only by an offline direct recount on the database. +This message is issued only once. + +% PGSQL_LB_NO_TLS_SUPPORT Attempt to configure TLS (unsupported for PostgreSQL): %1 +This error message is printed when TLS support was required in the Kea +configuration: Kea was built with this feature disabled for PostgreSQL. +The parameters of the connection are logged. + +% PGSQL_LB_ROLLBACK rolling back PostgreSQL database +Logged at debug log level 50. +The code has issued a rollback call. All outstanding transaction will +be rolled back and not committed to the database. + +% PGSQL_LB_TLS_SUPPORT Attempt to configure TLS: %1 +This informational message is printed when TLS support was required in +the Kea configuration: The TLS support in PostgreSQL will be initialized but +its configuration is fully managed outside the C API. +The parameters of the connection are logged. + +% PGSQL_LB_UPDATE_ADDR4 updating IPv4 lease for address %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to update IPv4 +lease from the PostgreSQL database for the specified address. + +% PGSQL_LB_UPDATE_ADDR6 updating IPv6 lease for address %1, lease type %2 +Logged at debug log level 50. +A debug message issued when the server is attempting to update IPv6 +lease from the PostgreSQL database for the specified address. + +% PGSQL_LB_UPGRADE_EXTENDED_INFO4 upgrading IPv4 leases done in %1 pages with %2 updated leases +Logged at debug log level 40. +The server upgraded extended info. The number of pages and the final count of +updated leases are displayed. + +% PGSQL_LB_UPGRADE_EXTENDED_INFO4_ERROR upgrading extending info for IPv4 lease at %1 failed with %2 +Logged at debug log level 40. +A debug message issued when the server failed to upgrade an extended info. +The address of the lease and the error message are displayed. + +% PGSQL_LB_UPGRADE_EXTENDED_INFO4_PAGE upgrading IPv4 lease extended info at page %1 starting at %2 (updated %3) +Logged at debug log level 50. +A debug message issued when the server upgrades IPv4 lease extended info. +The page number and started address, and the count of already updated leases +are displayed. + +% PGSQL_LB_UPGRADE_EXTENDED_INFO6 upgrading IPv6 leases done in %1 pages with %2 updated leases +Logged at debug log level 40. +The server upgraded extended info. The number of pages and the final count of +updated leases are displayed. + +% PGSQL_LB_UPGRADE_EXTENDED_INFO6_ERROR upgrading extending info for IPv6 lease at %1 failed with %2 +Logged at debug log level 40. +A debug message issued when the server failed to upgrade the extended info +for a lease. The address of the lease and the error message are displayed. + +% PGSQL_LB_UPGRADE_EXTENDED_INFO6_PAGE upgrading IPv6 lease extended info at page %1 starting at %2 (updated %3) +Logged at debug log level 50. +A debug message issued when the server upgrades IPv6 lease extended info. +The page number and started address, and the count of already updated leases +are displayed. + diff --git a/src/hooks/dhcp/pgsql/pgsql_lease_mgr.cc b/src/hooks/dhcp/pgsql/pgsql_lease_mgr.cc index 38d851ecc7..744ed54345 100644 --- a/src/hooks/dhcp/pgsql/pgsql_lease_mgr.cc +++ b/src/hooks/dhcp/pgsql/pgsql_lease_mgr.cc @@ -1488,7 +1488,7 @@ public: row.state_count_ = 0; if (!negative_count_) { negative_count_ = true; - LOG_WARN(dhcpsrv_logger, DHCPSRV_PGSQL_NEGATIVE_LEASES_STAT); + LOG_WARN(pgsql_lb_logger, PGSQL_LB_NEGATIVE_LEASES_STAT); } } @@ -1627,13 +1627,13 @@ PgSqlLeaseMgr::PgSqlLeaseMgr(const DatabaseConnection::ParameterMap& parameters) #ifdef HAVE_PGSQL_SSL if ((tls > 0) && !PgSqlConnection::warned_about_tls) { PgSqlConnection::warned_about_tls = true; - LOG_INFO(dhcpsrv_logger, DHCPSRV_PGSQL_TLS_SUPPORT) + LOG_INFO(pgsql_lb_logger, PGSQL_LB_TLS_SUPPORT) .arg(DatabaseConnection::redactedAccessString(parameters_)); PQinitSSL(1); } #else if (tls > 0) { - LOG_ERROR(dhcpsrv_logger, DHCPSRV_PGSQL_NO_TLS_SUPPORT) + LOG_ERROR(pgsql_lb_logger, PGSQL_LB_NO_TLS_SUPPORT) .arg(DatabaseConnection::redactedAccessString(parameters_)); isc_throw(DbOpenError, "Attempt to configure TLS for PostgreSQL " << "backend (built with this feature disabled)"); @@ -1675,7 +1675,7 @@ PgSqlLeaseMgr::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) { LeaseMgrFactory::recreate(cfg_db->getLeaseDbAccessString()); reopened = true; } catch (const std::exception& ex) { - LOG_ERROR(dhcpsrv_logger, DHCPSRV_PGSQL_LEASE_DB_RECONNECT_ATTEMPT_FAILED) + LOG_ERROR(pgsql_lb_logger, PGSQL_LB_DB_RECONNECT_ATTEMPT_FAILED) .arg(ex.what()); } @@ -1692,7 +1692,7 @@ PgSqlLeaseMgr::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) { } else { if (!db_reconnect_ctl->checkRetries()) { // We're out of retries, log it and initiate shutdown. - LOG_ERROR(dhcpsrv_logger, DHCPSRV_PGSQL_LEASE_DB_RECONNECT_FAILED) + LOG_ERROR(pgsql_lb_logger, PGSQL_LB_DB_RECONNECT_FAILED) .arg(db_reconnect_ctl->maxRetries()); // Cancel the timer. @@ -1705,7 +1705,7 @@ PgSqlLeaseMgr::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) { return (false); } - LOG_INFO(dhcpsrv_logger, DHCPSRV_PGSQL_LEASE_DB_RECONNECT_ATTEMPT_SCHEDULE) + LOG_INFO(pgsql_lb_logger, PGSQL_LB_DB_RECONNECT_ATTEMPT_SCHEDULE) .arg(db_reconnect_ctl->maxRetries() - db_reconnect_ctl->retriesLeft() + 1) .arg(db_reconnect_ctl->maxRetries()) .arg(db_reconnect_ctl->retryInterval()); @@ -1793,7 +1793,7 @@ PgSqlLeaseMgr::addLeaseCommon(PgSqlLeaseContextPtr& ctx, bool PgSqlLeaseMgr::addLease(const Lease4Ptr& lease) { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_ADD_ADDR4) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_ADD_ADDR4) .arg(lease->addr_.toText()); // Get a context @@ -1818,7 +1818,7 @@ PgSqlLeaseMgr::addLease(const Lease4Ptr& lease) { bool PgSqlLeaseMgr::addLease(const Lease6Ptr& lease) { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_ADD_ADDR6) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_ADD_ADDR6) .arg(lease->addr_.toText()) .arg(lease->type_); @@ -1922,7 +1922,7 @@ PgSqlLeaseMgr::getLease(PgSqlLeaseContextPtr& ctx, Lease4Ptr PgSqlLeaseMgr::getLease4(const IOAddress& addr) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_GET_ADDR4) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_GET_ADDR4) .arg(addr.toText()); // Set up the WHERE clause value @@ -1946,7 +1946,7 @@ PgSqlLeaseMgr::getLease4(const IOAddress& addr) const { Lease4Collection PgSqlLeaseMgr::getLease4(const HWAddr& hwaddr) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_GET_HWADDR) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_GET_HWADDR) .arg(hwaddr.toText()); // Set up the WHERE clause value @@ -1973,7 +1973,7 @@ PgSqlLeaseMgr::getLease4(const HWAddr& hwaddr) const { Lease4Ptr PgSqlLeaseMgr::getLease4(const HWAddr& hwaddr, SubnetID subnet_id) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_GET_SUBID_HWADDR) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_GET_SUBID_HWADDR) .arg(subnet_id) .arg(hwaddr.toText()); @@ -2005,7 +2005,7 @@ PgSqlLeaseMgr::getLease4(const HWAddr& hwaddr, SubnetID subnet_id) const { Lease4Collection PgSqlLeaseMgr::getLease4(const ClientId& clientid) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_GET_CLIENTID) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_GET_CLIENTID) .arg(clientid.toText()); // Set up the WHERE clause value @@ -2028,7 +2028,7 @@ PgSqlLeaseMgr::getLease4(const ClientId& clientid) const { Lease4Ptr PgSqlLeaseMgr::getLease4(const ClientId& clientid, SubnetID subnet_id) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_GET_SUBID_CLIENTID) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_GET_SUBID_CLIENTID) .arg(subnet_id) .arg(clientid.toText()); @@ -2056,7 +2056,7 @@ PgSqlLeaseMgr::getLease4(const ClientId& clientid, SubnetID subnet_id) const { Lease4Collection PgSqlLeaseMgr::getLeases4(SubnetID subnet_id) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_GET_SUBID4) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_GET_SUBID4) .arg(subnet_id); // Set up the WHERE clause value @@ -2080,7 +2080,7 @@ PgSqlLeaseMgr::getLeases4(SubnetID subnet_id) const { Lease4Collection PgSqlLeaseMgr::getLeases4(const std::string& hostname) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_GET_HOSTNAME4) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_GET_HOSTNAME4) .arg(hostname); // Set up the WHERE clause value @@ -2103,7 +2103,7 @@ PgSqlLeaseMgr::getLeases4(const std::string& hostname) const { Lease4Collection PgSqlLeaseMgr::getLeases4() const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_GET4); + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_GET4); // Provide empty binding array because our query has no parameters in // WHERE clause. @@ -2129,7 +2129,7 @@ PgSqlLeaseMgr::getLeases4(const IOAddress& lower_bound_address, << lower_bound_address); } - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_GET_PAGE4) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_GET_PAGE4) .arg(page_size.page_size_) .arg(lower_bound_address.toText()); @@ -2159,7 +2159,7 @@ PgSqlLeaseMgr::getLeases4(const IOAddress& lower_bound_address, Lease6Ptr PgSqlLeaseMgr::getLease6(Lease::Type lease_type, const IOAddress& addr) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_GET_ADDR6) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_GET_ADDR6) .arg(addr.toText()) .arg(lease_type); @@ -2189,7 +2189,7 @@ PgSqlLeaseMgr::getLease6(Lease::Type lease_type, Lease6Collection PgSqlLeaseMgr::getLeases6(Lease::Type lease_type, const DUID& duid, uint32_t iaid) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_GET_IAID_DUID) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_GET_IAID_DUID) .arg(iaid) .arg(duid.toText()) .arg(lease_type); @@ -2223,7 +2223,7 @@ PgSqlLeaseMgr::getLeases6(Lease::Type lease_type, const DUID& duid, Lease6Collection PgSqlLeaseMgr::getLeases6(Lease::Type lease_type, const DUID& duid, uint32_t iaid, SubnetID subnet_id) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_GET_IAID_SUBID_DUID) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_GET_IAID_SUBID_DUID) .arg(iaid) .arg(subnet_id) .arg(duid.toText()) @@ -2261,7 +2261,7 @@ PgSqlLeaseMgr::getLeases6(Lease::Type lease_type, const DUID& duid, Lease6Collection PgSqlLeaseMgr::getLeases6(SubnetID subnet_id) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_GET_SUBID6) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_GET_SUBID6) .arg(subnet_id); // Set up the WHERE clause value @@ -2287,8 +2287,8 @@ Lease6Collection PgSqlLeaseMgr::getLeases6(SubnetID subnet_id, const IOAddress& lower_bound_address, const LeasePageSize& page_size) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, - DHCPSRV_PGSQL_GET_SUBID_PAGE6) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, + PGSQL_LB_GET_SUBID_PAGE6) .arg(page_size.page_size_) .arg(lower_bound_address.toText()) .arg(subnet_id); @@ -2329,7 +2329,7 @@ PgSqlLeaseMgr::getLeases6(SubnetID subnet_id, Lease6Collection PgSqlLeaseMgr::getLeases6(const DUID& duid) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_GET_DUID) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_GET_DUID) .arg(duid.toText()); // Set up the WHERE clause value @@ -2351,7 +2351,7 @@ PgSqlLeaseMgr::getLeases6(const DUID& duid) const { Lease6Collection PgSqlLeaseMgr::getLeases6(const std::string& hostname) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_GET_HOSTNAME6) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_GET_HOSTNAME6) .arg(hostname); // Set up the WHERE clause value @@ -2374,7 +2374,7 @@ PgSqlLeaseMgr::getLeases6(const std::string& hostname) const { Lease6Collection PgSqlLeaseMgr::getLeases6() const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_GET6); + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_GET6); // Provide empty binding array because our query has no parameters in // WHERE clause. @@ -2400,7 +2400,7 @@ PgSqlLeaseMgr::getLeases6(const IOAddress& lower_bound_address, << lower_bound_address); } - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_GET_PAGE6) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_GET_PAGE6) .arg(page_size.page_size_) .arg(lower_bound_address.toText()); @@ -2431,7 +2431,7 @@ PgSqlLeaseMgr::getLeases6(const IOAddress& lower_bound_address, void PgSqlLeaseMgr::getExpiredLeases4(Lease4Collection& expired_leases, const size_t max_leases) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_GET_EXPIRED4) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_GET_EXPIRED4) .arg(max_leases); getExpiredLeasesCommon(expired_leases, max_leases, GET_LEASE4_EXPIRE); } @@ -2439,7 +2439,7 @@ PgSqlLeaseMgr::getExpiredLeases4(Lease4Collection& expired_leases, void PgSqlLeaseMgr::getExpiredLeases6(Lease6Collection& expired_leases, const size_t max_leases) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_GET_EXPIRED6) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_GET_EXPIRED6) .arg(max_leases); getExpiredLeasesCommon(expired_leases, max_leases, GET_LEASE6_EXPIRE); } @@ -2511,7 +2511,7 @@ void PgSqlLeaseMgr::updateLease4(const Lease4Ptr& lease) { const StatementIndex stindex = UPDATE_LEASE4; - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_UPDATE_ADDR4) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_UPDATE_ADDR4) .arg(lease->addr_.toText()); // Get a context @@ -2552,7 +2552,7 @@ void PgSqlLeaseMgr::updateLease6(const Lease6Ptr& lease) { const StatementIndex stindex = UPDATE_LEASE6; - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_UPDATE_ADDR6) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_UPDATE_ADDR6) .arg(lease->addr_.toText()) .arg(lease->type_); @@ -2630,7 +2630,8 @@ PgSqlLeaseMgr::deleteLeaseCommon(PgSqlLeaseContextPtr& ctx, bool PgSqlLeaseMgr::deleteLease(const Lease4Ptr& lease) { const IOAddress& addr = lease->addr_; - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_DELETE_ADDR) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, + PGSQL_LB_DELETE_ADDR4) .arg(addr.toText()); // Set up the WHERE clause value @@ -2677,8 +2678,8 @@ PgSqlLeaseMgr::deleteLease(const Lease4Ptr& lease) { bool PgSqlLeaseMgr::deleteLease(const Lease6Ptr& lease) { const IOAddress& addr = lease->addr_; - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, - DHCPSRV_PGSQL_DELETE_ADDR) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, + PGSQL_LB_DELETE_ADDR6) .arg(addr.toText()); lease->extended_info_action_ = Lease6::ACTION_IGNORE; @@ -2730,14 +2731,14 @@ PgSqlLeaseMgr::deleteLease(const Lease6Ptr& lease) { uint64_t PgSqlLeaseMgr::deleteExpiredReclaimedLeases4(const uint32_t secs) { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED4) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_DELETE_EXPIRED_RECLAIMED4) .arg(secs); return (deleteExpiredReclaimedLeasesCommon(secs, DELETE_LEASE4_STATE_EXPIRED)); } uint64_t PgSqlLeaseMgr::deleteExpiredReclaimedLeases6(const uint32_t secs) { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED6) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_DELETE_EXPIRED_RECLAIMED6) .arg(secs); return (deleteExpiredReclaimedLeasesCommon(secs, DELETE_LEASE6_STATE_EXPIRED)); } @@ -3026,7 +3027,7 @@ PgSqlLeaseMgr::getDescription() const { std::pair PgSqlLeaseMgr::getVersion(const string& timer_name) const { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_GET_VERSION); + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_GET_VERSION); IOServiceAccessorPtr ac(new IOServiceAccessor(&DatabaseConnection::getIOService)); DbCallback cb(&PgSqlLeaseMgr::dbReconnect); @@ -3036,12 +3037,12 @@ PgSqlLeaseMgr::getVersion(const string& timer_name) const { void PgSqlLeaseMgr::commit() { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_COMMIT); + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_COMMIT); } void PgSqlLeaseMgr::rollback() { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_ROLLBACK); + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, PGSQL_LB_ROLLBACK); } void @@ -3224,8 +3225,8 @@ PgSqlLeaseMgr::getLeases4ByRelayId(const OptionBuffer& relay_id, isc_throw(BadValue, "start time must be before end time"); } - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, - DHCPSRV_PGSQL_GET_RELAYID4) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, + PGSQL_LB_GET_RELAYID4) .arg(page_size.page_size_) .arg(lower_bound_address.toText()) .arg(idToText(relay_id)) @@ -3313,8 +3314,8 @@ PgSqlLeaseMgr::getLeases4ByRemoteId(const OptionBuffer& remote_id, isc_throw(BadValue, "start time must be before end time"); } - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, - DHCPSRV_PGSQL_GET_REMOTEID4) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, + PGSQL_LB_GET_REMOTEID4) .arg(page_size.page_size_) .arg(lower_bound_address.toText()) .arg(idToText(remote_id)) @@ -3385,8 +3386,8 @@ PgSqlLeaseMgr::upgradeExtendedInfo4(const LeasePageSize& page_size) { size_t updated = 0; IOAddress start_addr = IOAddress::IPV4_ZERO_ADDRESS(); for (;;) { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, - DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4_PAGE) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, + PGSQL_LB_UPGRADE_EXTENDED_INFO4_PAGE) .arg(pages) .arg(start_addr.toText()) .arg(updated); @@ -3446,15 +3447,15 @@ PgSqlLeaseMgr::upgradeExtendedInfo4(const LeasePageSize& page_size) { continue; } catch (const std::exception& ex) { // Something when wrong, for instance extract failed. - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE, - DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4_ERROR) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE, + PGSQL_LB_UPGRADE_EXTENDED_INFO4_ERROR) .arg(lease->addr_.toText()) .arg(ex.what()); } } } - LOG_INFO(dhcpsrv_logger, DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4) + LOG_INFO(pgsql_lb_logger, PGSQL_LB_UPGRADE_EXTENDED_INFO4) .arg(pages) .arg(updated); @@ -3465,8 +3466,8 @@ Lease6Collection PgSqlLeaseMgr::getLeases6ByRelayId(const DUID& relay_id, const IOAddress& lower_bound_address, const LeasePageSize& page_size) { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, - DHCPSRV_PGSQL_GET_RELAYID6) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, + PGSQL_LB_GET_RELAYID6) .arg(page_size.page_size_) .arg(lower_bound_address.toText()) .arg(relay_id.toText()); @@ -3511,8 +3512,8 @@ Lease6Collection PgSqlLeaseMgr::getLeases6ByRemoteId(const OptionBuffer& remote_id, const IOAddress& lower_bound_address, const LeasePageSize& page_size) { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, - DHCPSRV_PGSQL_GET_REMOTEID6) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, + PGSQL_LB_GET_REMOTEID6) .arg(page_size.page_size_) .arg(lower_bound_address.toText()) .arg(idToText(remote_id)); @@ -3566,8 +3567,8 @@ PgSqlLeaseMgr::upgradeExtendedInfo6(const LeasePageSize& page_size) { size_t updated = 0; IOAddress start_addr = IOAddress::IPV6_ZERO_ADDRESS(); for (;;) { - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, - DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6_PAGE) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE_DETAIL, + PGSQL_LB_UPGRADE_EXTENDED_INFO6_PAGE) .arg(pages) .arg(start_addr.toText()) .arg(updated); @@ -3618,15 +3619,15 @@ PgSqlLeaseMgr::upgradeExtendedInfo6(const LeasePageSize& page_size) { continue; } catch (const std::exception& ex) { // Something when wrong, for instance extract failed. - LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE, - DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6_ERROR) + LOG_DEBUG(pgsql_lb_logger, PGSQL_LB_DBG_TRACE, + PGSQL_LB_UPGRADE_EXTENDED_INFO6_ERROR) .arg(lease->addr_.toText()) .arg(ex.what()); } } } - LOG_INFO(dhcpsrv_logger, DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6) + LOG_INFO(pgsql_lb_logger, PGSQL_LB_UPGRADE_EXTENDED_INFO6) .arg(pages) .arg(updated); diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.cc b/src/lib/dhcpsrv/dhcpsrv_messages.cc index ff6e78fe85..af6e09c28d 100644 --- a/src/lib/dhcpsrv/dhcpsrv_messages.cc +++ b/src/lib/dhcpsrv/dhcpsrv_messages.cc @@ -87,7 +87,8 @@ extern const isc::log::MessageID DHCPSRV_MEMFILE_BUILD_EXTENDED_INFO_TABLES6_ERR extern const isc::log::MessageID DHCPSRV_MEMFILE_COMMIT = "DHCPSRV_MEMFILE_COMMIT"; extern const isc::log::MessageID DHCPSRV_MEMFILE_CONVERTING_LEASE_FILES = "DHCPSRV_MEMFILE_CONVERTING_LEASE_FILES"; extern const isc::log::MessageID DHCPSRV_MEMFILE_DB = "DHCPSRV_MEMFILE_DB"; -extern const isc::log::MessageID DHCPSRV_MEMFILE_DELETE_ADDR = "DHCPSRV_MEMFILE_DELETE_ADDR"; +extern const isc::log::MessageID DHCPSRV_MEMFILE_DELETE_ADDR4 = "DHCPSRV_MEMFILE_DELETE_ADDR4"; +extern const isc::log::MessageID DHCPSRV_MEMFILE_DELETE_ADDR6 = "DHCPSRV_MEMFILE_DELETE_ADDR6"; extern const isc::log::MessageID DHCPSRV_MEMFILE_DELETE_EXPIRED_RECLAIMED4 = "DHCPSRV_MEMFILE_DELETE_EXPIRED_RECLAIMED4"; extern const isc::log::MessageID DHCPSRV_MEMFILE_DELETE_EXPIRED_RECLAIMED6 = "DHCPSRV_MEMFILE_DELETE_EXPIRED_RECLAIMED6"; extern const isc::log::MessageID DHCPSRV_MEMFILE_DELETE_EXPIRED_RECLAIMED_START = "DHCPSRV_MEMFILE_DELETE_EXPIRED_RECLAIMED_START"; @@ -140,112 +141,9 @@ extern const isc::log::MessageID DHCPSRV_MEMFILE_WIPE_LEASES6 = "DHCPSRV_MEMFILE extern const isc::log::MessageID DHCPSRV_MEMFILE_WIPE_LEASES6_FINISHED = "DHCPSRV_MEMFILE_WIPE_LEASES6_FINISHED"; extern const isc::log::MessageID DHCPSRV_MT_DISABLED_QUEUE_CONTROL = "DHCPSRV_MT_DISABLED_QUEUE_CONTROL"; extern const isc::log::MessageID DHCPSRV_MULTIPLE_RAW_SOCKETS_PER_IFACE = "DHCPSRV_MULTIPLE_RAW_SOCKETS_PER_IFACE"; -extern const isc::log::MessageID DHCPSRV_MYSQL_ADD_ADDR4 = "DHCPSRV_MYSQL_ADD_ADDR4"; -extern const isc::log::MessageID DHCPSRV_MYSQL_ADD_ADDR6 = "DHCPSRV_MYSQL_ADD_ADDR6"; -extern const isc::log::MessageID DHCPSRV_MYSQL_COMMIT = "DHCPSRV_MYSQL_COMMIT"; -extern const isc::log::MessageID DHCPSRV_MYSQL_DELETED_EXPIRED_RECLAIMED = "DHCPSRV_MYSQL_DELETED_EXPIRED_RECLAIMED"; -extern const isc::log::MessageID DHCPSRV_MYSQL_DELETE_ADDR = "DHCPSRV_MYSQL_DELETE_ADDR"; -extern const isc::log::MessageID DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED4 = "DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED4"; -extern const isc::log::MessageID DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED6 = "DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED6"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET4 = "DHCPSRV_MYSQL_GET4"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET6 = "DHCPSRV_MYSQL_GET6"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_ADDR4 = "DHCPSRV_MYSQL_GET_ADDR4"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_ADDR6 = "DHCPSRV_MYSQL_GET_ADDR6"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_CLIENTID = "DHCPSRV_MYSQL_GET_CLIENTID"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_DUID = "DHCPSRV_MYSQL_GET_DUID"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_EXPIRED4 = "DHCPSRV_MYSQL_GET_EXPIRED4"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_EXPIRED6 = "DHCPSRV_MYSQL_GET_EXPIRED6"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_HOSTNAME4 = "DHCPSRV_MYSQL_GET_HOSTNAME4"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_HOSTNAME6 = "DHCPSRV_MYSQL_GET_HOSTNAME6"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_HWADDR = "DHCPSRV_MYSQL_GET_HWADDR"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_IAID_DUID = "DHCPSRV_MYSQL_GET_IAID_DUID"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_IAID_SUBID_DUID = "DHCPSRV_MYSQL_GET_IAID_SUBID_DUID"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_PAGE4 = "DHCPSRV_MYSQL_GET_PAGE4"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_PAGE6 = "DHCPSRV_MYSQL_GET_PAGE6"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_RELAYID4 = "DHCPSRV_MYSQL_GET_RELAYID4"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_RELAYID6 = "DHCPSRV_MYSQL_GET_RELAYID6"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_REMOTEID4 = "DHCPSRV_MYSQL_GET_REMOTEID4"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_REMOTEID6 = "DHCPSRV_MYSQL_GET_REMOTEID6"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_SUBID4 = "DHCPSRV_MYSQL_GET_SUBID4"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_SUBID6 = "DHCPSRV_MYSQL_GET_SUBID6"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_SUBID_CLIENTID = "DHCPSRV_MYSQL_GET_SUBID_CLIENTID"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_SUBID_HWADDR = "DHCPSRV_MYSQL_GET_SUBID_HWADDR"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_SUBID_PAGE6 = "DHCPSRV_MYSQL_GET_SUBID_PAGE6"; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_VERSION = "DHCPSRV_MYSQL_GET_VERSION"; -extern const isc::log::MessageID DHCPSRV_MYSQL_HOST_DB_GET_VERSION = "DHCPSRV_MYSQL_HOST_DB_GET_VERSION"; -extern const isc::log::MessageID DHCPSRV_MYSQL_HOST_DB_READONLY = "DHCPSRV_MYSQL_HOST_DB_READONLY"; -extern const isc::log::MessageID DHCPSRV_MYSQL_HOST_DB_RECONNECT_ATTEMPT_FAILED = "DHCPSRV_MYSQL_HOST_DB_RECONNECT_ATTEMPT_FAILED"; -extern const isc::log::MessageID DHCPSRV_MYSQL_HOST_DB_RECONNECT_ATTEMPT_SCHEDULE = "DHCPSRV_MYSQL_HOST_DB_RECONNECT_ATTEMPT_SCHEDULE"; -extern const isc::log::MessageID DHCPSRV_MYSQL_HOST_DB_RECONNECT_FAILED = "DHCPSRV_MYSQL_HOST_DB_RECONNECT_FAILED"; -extern const isc::log::MessageID DHCPSRV_MYSQL_LEASE_DB_RECONNECT_ATTEMPT_FAILED = "DHCPSRV_MYSQL_LEASE_DB_RECONNECT_ATTEMPT_FAILED"; -extern const isc::log::MessageID DHCPSRV_MYSQL_LEASE_DB_RECONNECT_ATTEMPT_SCHEDULE = "DHCPSRV_MYSQL_LEASE_DB_RECONNECT_ATTEMPT_SCHEDULE"; -extern const isc::log::MessageID DHCPSRV_MYSQL_LEASE_DB_RECONNECT_FAILED = "DHCPSRV_MYSQL_LEASE_DB_RECONNECT_FAILED"; -extern const isc::log::MessageID DHCPSRV_MYSQL_NEGATIVE_LEASES_STAT = "DHCPSRV_MYSQL_NEGATIVE_LEASES_STAT"; -extern const isc::log::MessageID DHCPSRV_MYSQL_NO_TLS = "DHCPSRV_MYSQL_NO_TLS"; -extern const isc::log::MessageID DHCPSRV_MYSQL_ROLLBACK = "DHCPSRV_MYSQL_ROLLBACK"; -extern const isc::log::MessageID DHCPSRV_MYSQL_TLS_CIPHER = "DHCPSRV_MYSQL_TLS_CIPHER"; -extern const isc::log::MessageID DHCPSRV_MYSQL_UPDATE_ADDR4 = "DHCPSRV_MYSQL_UPDATE_ADDR4"; -extern const isc::log::MessageID DHCPSRV_MYSQL_UPDATE_ADDR6 = "DHCPSRV_MYSQL_UPDATE_ADDR6"; -extern const isc::log::MessageID DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4 = "DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4"; -extern const isc::log::MessageID DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4_ERROR = "DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4_ERROR"; -extern const isc::log::MessageID DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4_PAGE = "DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4_PAGE"; -extern const isc::log::MessageID DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6 = "DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6"; -extern const isc::log::MessageID DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6_ERROR = "DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6_ERROR"; -extern const isc::log::MessageID DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6_PAGE = "DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6_PAGE"; extern const isc::log::MessageID DHCPSRV_NOTYPE_DB = "DHCPSRV_NOTYPE_DB"; extern const isc::log::MessageID DHCPSRV_NO_SOCKETS_OPEN = "DHCPSRV_NO_SOCKETS_OPEN"; extern const isc::log::MessageID DHCPSRV_OPEN_SOCKET_FAIL = "DHCPSRV_OPEN_SOCKET_FAIL"; -extern const isc::log::MessageID DHCPSRV_PGSQL_ADD_ADDR4 = "DHCPSRV_PGSQL_ADD_ADDR4"; -extern const isc::log::MessageID DHCPSRV_PGSQL_ADD_ADDR6 = "DHCPSRV_PGSQL_ADD_ADDR6"; -extern const isc::log::MessageID DHCPSRV_PGSQL_COMMIT = "DHCPSRV_PGSQL_COMMIT"; -extern const isc::log::MessageID DHCPSRV_PGSQL_DELETE_ADDR = "DHCPSRV_PGSQL_DELETE_ADDR"; -extern const isc::log::MessageID DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED4 = "DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED4"; -extern const isc::log::MessageID DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED6 = "DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED6"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET4 = "DHCPSRV_PGSQL_GET4"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET6 = "DHCPSRV_PGSQL_GET6"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_ADDR4 = "DHCPSRV_PGSQL_GET_ADDR4"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_ADDR6 = "DHCPSRV_PGSQL_GET_ADDR6"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_CLIENTID = "DHCPSRV_PGSQL_GET_CLIENTID"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_DUID = "DHCPSRV_PGSQL_GET_DUID"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_EXPIRED4 = "DHCPSRV_PGSQL_GET_EXPIRED4"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_EXPIRED6 = "DHCPSRV_PGSQL_GET_EXPIRED6"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_HOSTNAME4 = "DHCPSRV_PGSQL_GET_HOSTNAME4"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_HOSTNAME6 = "DHCPSRV_PGSQL_GET_HOSTNAME6"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_HWADDR = "DHCPSRV_PGSQL_GET_HWADDR"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_IAID_DUID = "DHCPSRV_PGSQL_GET_IAID_DUID"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_IAID_SUBID_DUID = "DHCPSRV_PGSQL_GET_IAID_SUBID_DUID"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_PAGE4 = "DHCPSRV_PGSQL_GET_PAGE4"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_PAGE6 = "DHCPSRV_PGSQL_GET_PAGE6"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_RELAYID4 = "DHCPSRV_PGSQL_GET_RELAYID4"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_RELAYID6 = "DHCPSRV_PGSQL_GET_RELAYID6"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_REMOTEID4 = "DHCPSRV_PGSQL_GET_REMOTEID4"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_REMOTEID6 = "DHCPSRV_PGSQL_GET_REMOTEID6"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_SUBID4 = "DHCPSRV_PGSQL_GET_SUBID4"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_SUBID6 = "DHCPSRV_PGSQL_GET_SUBID6"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_SUBID_CLIENTID = "DHCPSRV_PGSQL_GET_SUBID_CLIENTID"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_SUBID_HWADDR = "DHCPSRV_PGSQL_GET_SUBID_HWADDR"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_SUBID_PAGE6 = "DHCPSRV_PGSQL_GET_SUBID_PAGE6"; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_VERSION = "DHCPSRV_PGSQL_GET_VERSION"; -extern const isc::log::MessageID DHCPSRV_PGSQL_HOST_DB_GET_VERSION = "DHCPSRV_PGSQL_HOST_DB_GET_VERSION"; -extern const isc::log::MessageID DHCPSRV_PGSQL_HOST_DB_READONLY = "DHCPSRV_PGSQL_HOST_DB_READONLY"; -extern const isc::log::MessageID DHCPSRV_PGSQL_HOST_DB_RECONNECT_ATTEMPT_FAILED = "DHCPSRV_PGSQL_HOST_DB_RECONNECT_ATTEMPT_FAILED"; -extern const isc::log::MessageID DHCPSRV_PGSQL_HOST_DB_RECONNECT_ATTEMPT_SCHEDULE = "DHCPSRV_PGSQL_HOST_DB_RECONNECT_ATTEMPT_SCHEDULE"; -extern const isc::log::MessageID DHCPSRV_PGSQL_HOST_DB_RECONNECT_FAILED = "DHCPSRV_PGSQL_HOST_DB_RECONNECT_FAILED"; -extern const isc::log::MessageID DHCPSRV_PGSQL_LEASE_DB_RECONNECT_ATTEMPT_FAILED = "DHCPSRV_PGSQL_LEASE_DB_RECONNECT_ATTEMPT_FAILED"; -extern const isc::log::MessageID DHCPSRV_PGSQL_LEASE_DB_RECONNECT_ATTEMPT_SCHEDULE = "DHCPSRV_PGSQL_LEASE_DB_RECONNECT_ATTEMPT_SCHEDULE"; -extern const isc::log::MessageID DHCPSRV_PGSQL_LEASE_DB_RECONNECT_FAILED = "DHCPSRV_PGSQL_LEASE_DB_RECONNECT_FAILED"; -extern const isc::log::MessageID DHCPSRV_PGSQL_NEGATIVE_LEASES_STAT = "DHCPSRV_PGSQL_NEGATIVE_LEASES_STAT"; -extern const isc::log::MessageID DHCPSRV_PGSQL_NO_TLS_SUPPORT = "DHCPSRV_PGSQL_NO_TLS_SUPPORT"; -extern const isc::log::MessageID DHCPSRV_PGSQL_ROLLBACK = "DHCPSRV_PGSQL_ROLLBACK"; -extern const isc::log::MessageID DHCPSRV_PGSQL_TLS_SUPPORT = "DHCPSRV_PGSQL_TLS_SUPPORT"; -extern const isc::log::MessageID DHCPSRV_PGSQL_UPDATE_ADDR4 = "DHCPSRV_PGSQL_UPDATE_ADDR4"; -extern const isc::log::MessageID DHCPSRV_PGSQL_UPDATE_ADDR6 = "DHCPSRV_PGSQL_UPDATE_ADDR6"; -extern const isc::log::MessageID DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4 = "DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4"; -extern const isc::log::MessageID DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4_ERROR = "DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4_ERROR"; -extern const isc::log::MessageID DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4_PAGE = "DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4_PAGE"; -extern const isc::log::MessageID DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6 = "DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6"; -extern const isc::log::MessageID DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6_ERROR = "DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6_ERROR"; -extern const isc::log::MessageID DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6_PAGE = "DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6_PAGE"; extern const isc::log::MessageID DHCPSRV_QUEUE_NCR = "DHCPSRV_QUEUE_NCR"; extern const isc::log::MessageID DHCPSRV_QUEUE_NCR_FAILED = "DHCPSRV_QUEUE_NCR_FAILED"; extern const isc::log::MessageID DHCPSRV_QUEUE_NCR_SKIP = "DHCPSRV_QUEUE_NCR_SKIP"; @@ -356,7 +254,8 @@ const char* values[] = { "DHCPSRV_MEMFILE_COMMIT", "committing to memory file database", "DHCPSRV_MEMFILE_CONVERTING_LEASE_FILES", "running LFC now to convert lease files to the current schema: %1.%2", "DHCPSRV_MEMFILE_DB", "opening memory file lease database: %1", - "DHCPSRV_MEMFILE_DELETE_ADDR", "deleting lease for address %1", + "DHCPSRV_MEMFILE_DELETE_ADDR4", "deleting lease for address %1", + "DHCPSRV_MEMFILE_DELETE_ADDR6", "deleting lease for address %1", "DHCPSRV_MEMFILE_DELETE_EXPIRED_RECLAIMED4", "deleting reclaimed IPv4 leases that expired more than %1 seconds ago", "DHCPSRV_MEMFILE_DELETE_EXPIRED_RECLAIMED6", "deleting reclaimed IPv6 leases that expired more than %1 seconds ago", "DHCPSRV_MEMFILE_DELETE_EXPIRED_RECLAIMED_START", "starting deletion of %1 expired-reclaimed leases", @@ -409,112 +308,9 @@ const char* values[] = { "DHCPSRV_MEMFILE_WIPE_LEASES6_FINISHED", "removing all IPv6 leases from subnet %1 finished, removed %2 leases", "DHCPSRV_MT_DISABLED_QUEUE_CONTROL", "disabling dhcp queue control when multi-threading is enabled.", "DHCPSRV_MULTIPLE_RAW_SOCKETS_PER_IFACE", "current configuration will result in opening multiple broadcast capable sockets on some interfaces and some DHCP messages may be duplicated", - "DHCPSRV_MYSQL_ADD_ADDR4", "adding IPv4 lease with address %1", - "DHCPSRV_MYSQL_ADD_ADDR6", "adding IPv6 lease with address %1, lease type %2", - "DHCPSRV_MYSQL_COMMIT", "committing to MySQL database", - "DHCPSRV_MYSQL_DELETED_EXPIRED_RECLAIMED", "deleted %1 reclaimed leases from the database", - "DHCPSRV_MYSQL_DELETE_ADDR", "deleting lease for address %1", - "DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED4", "deleting reclaimed IPv4 leases that expired more than %1 seconds ago", - "DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED6", "deleting reclaimed IPv6 leases that expired more than %1 seconds ago", - "DHCPSRV_MYSQL_GET4", "obtaining all IPv4 leases", - "DHCPSRV_MYSQL_GET6", "obtaining all IPv6 leases", - "DHCPSRV_MYSQL_GET_ADDR4", "obtaining IPv4 lease for address %1", - "DHCPSRV_MYSQL_GET_ADDR6", "obtaining IPv6 lease for address %1, lease type %2", - "DHCPSRV_MYSQL_GET_CLIENTID", "obtaining IPv4 leases for client ID %1", - "DHCPSRV_MYSQL_GET_DUID", "obtaining IPv6 lease for duid %1,", - "DHCPSRV_MYSQL_GET_EXPIRED4", "obtaining maximum %1 of expired IPv4 leases", - "DHCPSRV_MYSQL_GET_EXPIRED6", "obtaining maximum %1 of expired IPv6 leases", - "DHCPSRV_MYSQL_GET_HOSTNAME4", "obtaining IPv4 leases for hostname %1", - "DHCPSRV_MYSQL_GET_HOSTNAME6", "obtaining IPv6 leases for hostname %1", - "DHCPSRV_MYSQL_GET_HWADDR", "obtaining IPv4 leases for hardware address %1", - "DHCPSRV_MYSQL_GET_IAID_DUID", "obtaining IPv6 leases for IAID %1, DUID %2, lease type %3", - "DHCPSRV_MYSQL_GET_IAID_SUBID_DUID", "obtaining IPv6 leases for IAID %1, Subnet ID %2, DUID %3, lease type %4", - "DHCPSRV_MYSQL_GET_PAGE4", "obtaining at most %1 IPv4 leases starting from address %2", - "DHCPSRV_MYSQL_GET_PAGE6", "obtaining at most %1 IPv6 leases starting from address %2", - "DHCPSRV_MYSQL_GET_RELAYID4", "obtaining at most %1 IPv4 leases starting from address %2 with relay id %3 and cltt between %4 and %5", - "DHCPSRV_MYSQL_GET_RELAYID6", "obtaining at most %1 IPv6 leases starting from address %2 with relay id %3", - "DHCPSRV_MYSQL_GET_REMOTEID4", "obtaining at most %1 IPv4 leases starting from address %2 with remote id %3 and cltt between %4 and %5", - "DHCPSRV_MYSQL_GET_REMOTEID6", "obtaining at most %1 IPv6 leases starting from address %2 with remote id %3", - "DHCPSRV_MYSQL_GET_SUBID4", "obtaining IPv4 leases for subnet ID %1", - "DHCPSRV_MYSQL_GET_SUBID6", "obtaining IPv6 leases for subnet ID %1", - "DHCPSRV_MYSQL_GET_SUBID_CLIENTID", "obtaining IPv4 lease for subnet ID %1 and client ID %2", - "DHCPSRV_MYSQL_GET_SUBID_HWADDR", "obtaining IPv4 lease for subnet ID %1 and hardware address %2", - "DHCPSRV_MYSQL_GET_SUBID_PAGE6", "obtaining at most %1 IPv6 leases starting from address %2 for subnet ID %3", - "DHCPSRV_MYSQL_GET_VERSION", "obtaining schema version information", - "DHCPSRV_MYSQL_HOST_DB_GET_VERSION", "obtaining schema version information for the MySQL hosts database", - "DHCPSRV_MYSQL_HOST_DB_READONLY", "MySQL host database opened for read access only", - "DHCPSRV_MYSQL_HOST_DB_RECONNECT_ATTEMPT_FAILED", "database reconnect failed: %1", - "DHCPSRV_MYSQL_HOST_DB_RECONNECT_ATTEMPT_SCHEDULE", "scheduling attempt %1 of %2 in %3 milliseconds", - "DHCPSRV_MYSQL_HOST_DB_RECONNECT_FAILED", "maximum number of database reconnect attempts: %1, has been exhausted without success", - "DHCPSRV_MYSQL_LEASE_DB_RECONNECT_ATTEMPT_FAILED", "database reconnect failed: %1", - "DHCPSRV_MYSQL_LEASE_DB_RECONNECT_ATTEMPT_SCHEDULE", "scheduling attempt %1 of %2 in %3 milliseconds", - "DHCPSRV_MYSQL_LEASE_DB_RECONNECT_FAILED", "maximum number of database reconnect attempts: %1, has been exhausted without success", - "DHCPSRV_MYSQL_NEGATIVE_LEASES_STAT", "recount of leases returned a negative value", - "DHCPSRV_MYSQL_NO_TLS", "TLS was required but is not used", - "DHCPSRV_MYSQL_ROLLBACK", "rolling back MySQL database", - "DHCPSRV_MYSQL_TLS_CIPHER", "TLS cipher: %1", - "DHCPSRV_MYSQL_UPDATE_ADDR4", "updating IPv4 lease for address %1", - "DHCPSRV_MYSQL_UPDATE_ADDR6", "updating IPv6 lease for address %1, lease type %2", - "DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4", "upgrading IPv4 leases done in %1 pages with %2 updated leases", - "DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4_ERROR", "upgrading extending info for IPv4 lease at %1 failed with %2", - "DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4_PAGE", "upgrading IPv4 lease extended info at page %1 starting at %2 (updated %3)", - "DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6", "upgrading IPv6 leases done in %1 pages with %2 updated leases", - "DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6_ERROR", "upgrading extending info for IPv6 lease at %1 failed with %2", - "DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6_PAGE", "upgrading IPv6 lease extended info at page %1 starting at %2 (updated %3)", "DHCPSRV_NOTYPE_DB", "no 'type' keyword to determine database backend: %1", "DHCPSRV_NO_SOCKETS_OPEN", "no interface configured to listen to DHCP traffic", "DHCPSRV_OPEN_SOCKET_FAIL", "failed to open socket: %1", - "DHCPSRV_PGSQL_ADD_ADDR4", "adding IPv4 lease with address %1", - "DHCPSRV_PGSQL_ADD_ADDR6", "adding IPv6 lease with address %1, lease type %2", - "DHCPSRV_PGSQL_COMMIT", "committing to PostgreSQL database", - "DHCPSRV_PGSQL_DELETE_ADDR", "deleting lease for address %1", - "DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED4", "deleting reclaimed IPv4 leases that expired more than %1 seconds ago", - "DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED6", "deleting reclaimed IPv6 leases that expired more than %1 seconds ago", - "DHCPSRV_PGSQL_GET4", "obtaining all IPv4 leases", - "DHCPSRV_PGSQL_GET6", "obtaining all IPv6 leases", - "DHCPSRV_PGSQL_GET_ADDR4", "obtaining IPv4 lease for address %1", - "DHCPSRV_PGSQL_GET_ADDR6", "obtaining IPv6 lease for address %1 (lease type %2)", - "DHCPSRV_PGSQL_GET_CLIENTID", "obtaining IPv4 leases for client ID %1", - "DHCPSRV_PGSQL_GET_DUID", "obtaining IPv6 leases for DUID %1,", - "DHCPSRV_PGSQL_GET_EXPIRED4", "obtaining maximum %1 of expired IPv4 leases", - "DHCPSRV_PGSQL_GET_EXPIRED6", "obtaining maximum %1 of expired IPv6 leases", - "DHCPSRV_PGSQL_GET_HOSTNAME4", "obtaining IPv4 leases for hostname %1", - "DHCPSRV_PGSQL_GET_HOSTNAME6", "obtaining IPv6 leases for hostname %1", - "DHCPSRV_PGSQL_GET_HWADDR", "obtaining IPv4 leases for hardware address %1", - "DHCPSRV_PGSQL_GET_IAID_DUID", "obtaining IPv4 leases for IAID %1 and DUID %2, lease type %3", - "DHCPSRV_PGSQL_GET_IAID_SUBID_DUID", "obtaining IPv4 leases for IAID %1, Subnet ID %2, DUID %3, and lease type %4", - "DHCPSRV_PGSQL_GET_PAGE4", "obtaining at most %1 IPv4 leases starting from address %2", - "DHCPSRV_PGSQL_GET_PAGE6", "obtaining at most %1 IPv6 leases starting from address %2", - "DHCPSRV_PGSQL_GET_RELAYID4", "obtaining at most %1 IPv4 leases starting from address %2 with relay id %3 and cltt between %4 and %5", - "DHCPSRV_PGSQL_GET_RELAYID6", "obtaining at most %1 IPv6 leases starting from address %2 with relay id %3", - "DHCPSRV_PGSQL_GET_REMOTEID4", "obtaining at most %1 IPv4 leases starting from address %2 with remote id %3 and cltt between %4 and %5", - "DHCPSRV_PGSQL_GET_REMOTEID6", "obtaining at most %1 IPv6 leases starting from address %2 with remote id %3", - "DHCPSRV_PGSQL_GET_SUBID4", "obtaining IPv4 leases for subnet ID %1", - "DHCPSRV_PGSQL_GET_SUBID6", "obtaining IPv6 leases for subnet ID %1", - "DHCPSRV_PGSQL_GET_SUBID_CLIENTID", "obtaining IPv4 lease for subnet ID %1 and client ID %2", - "DHCPSRV_PGSQL_GET_SUBID_HWADDR", "obtaining IPv4 lease for subnet ID %1 and hardware address %2", - "DHCPSRV_PGSQL_GET_SUBID_PAGE6", "obtaining at most %1 IPv6 leases starting from address %2 for subnet ID %3", - "DHCPSRV_PGSQL_GET_VERSION", "obtaining schema version information", - "DHCPSRV_PGSQL_HOST_DB_GET_VERSION", "obtaining schema version information for the PostgreSQL hosts database", - "DHCPSRV_PGSQL_HOST_DB_READONLY", "PostgreSQL host database opened for read access only", - "DHCPSRV_PGSQL_HOST_DB_RECONNECT_ATTEMPT_FAILED", "database reconnect failed: %1", - "DHCPSRV_PGSQL_HOST_DB_RECONNECT_ATTEMPT_SCHEDULE", "scheduling attempt %1 of %2 in %3 milliseconds", - "DHCPSRV_PGSQL_HOST_DB_RECONNECT_FAILED", "maximum number of database reconnect attempts: %1, has been exhausted without success", - "DHCPSRV_PGSQL_LEASE_DB_RECONNECT_ATTEMPT_FAILED", "database reconnect failed: %1", - "DHCPSRV_PGSQL_LEASE_DB_RECONNECT_ATTEMPT_SCHEDULE", "scheduling attempt %1 of %2 in %3 milliseconds", - "DHCPSRV_PGSQL_LEASE_DB_RECONNECT_FAILED", "maximum number of database reconnect attempts: %1, has been exhausted without success", - "DHCPSRV_PGSQL_NEGATIVE_LEASES_STAT", "recount of leases returned a negative value", - "DHCPSRV_PGSQL_NO_TLS_SUPPORT", "Attempt to configure TLS (unsupported for PostgreSQL): %1", - "DHCPSRV_PGSQL_ROLLBACK", "rolling back PostgreSQL database", - "DHCPSRV_PGSQL_TLS_SUPPORT", "Attempt to configure TLS: %1", - "DHCPSRV_PGSQL_UPDATE_ADDR4", "updating IPv4 lease for address %1", - "DHCPSRV_PGSQL_UPDATE_ADDR6", "updating IPv6 lease for address %1, lease type %2", - "DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4", "upgrading IPv4 leases done in %1 pages with %2 updated leases", - "DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4_ERROR", "upgrading extending info for IPv4 lease at %1 failed with %2", - "DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4_PAGE", "upgrading IPv4 lease extended info at page %1 starting at %2 (updated %3)", - "DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6", "upgrading IPv6 leases done in %1 pages with %2 updated leases", - "DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6_ERROR", "upgrading extending info for IPv6 lease at %1 failed with %2", - "DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6_PAGE", "upgrading IPv6 lease extended info at page %1 starting at %2 (updated %3)", "DHCPSRV_QUEUE_NCR", "%1: Name change request to %2 DNS entry queued: %3", "DHCPSRV_QUEUE_NCR_FAILED", "%1: queuing %2 name change request failed for lease %3: %4", "DHCPSRV_QUEUE_NCR_SKIP", "%1: skip queuing name change request for lease: %2", diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.h b/src/lib/dhcpsrv/dhcpsrv_messages.h index 9bedc3d6a0..dcb7447534 100644 --- a/src/lib/dhcpsrv/dhcpsrv_messages.h +++ b/src/lib/dhcpsrv/dhcpsrv_messages.h @@ -88,7 +88,8 @@ extern const isc::log::MessageID DHCPSRV_MEMFILE_BUILD_EXTENDED_INFO_TABLES6_ERR extern const isc::log::MessageID DHCPSRV_MEMFILE_COMMIT; extern const isc::log::MessageID DHCPSRV_MEMFILE_CONVERTING_LEASE_FILES; extern const isc::log::MessageID DHCPSRV_MEMFILE_DB; -extern const isc::log::MessageID DHCPSRV_MEMFILE_DELETE_ADDR; +extern const isc::log::MessageID DHCPSRV_MEMFILE_DELETE_ADDR4; +extern const isc::log::MessageID DHCPSRV_MEMFILE_DELETE_ADDR6; extern const isc::log::MessageID DHCPSRV_MEMFILE_DELETE_EXPIRED_RECLAIMED4; extern const isc::log::MessageID DHCPSRV_MEMFILE_DELETE_EXPIRED_RECLAIMED6; extern const isc::log::MessageID DHCPSRV_MEMFILE_DELETE_EXPIRED_RECLAIMED_START; @@ -141,112 +142,9 @@ extern const isc::log::MessageID DHCPSRV_MEMFILE_WIPE_LEASES6; extern const isc::log::MessageID DHCPSRV_MEMFILE_WIPE_LEASES6_FINISHED; extern const isc::log::MessageID DHCPSRV_MT_DISABLED_QUEUE_CONTROL; extern const isc::log::MessageID DHCPSRV_MULTIPLE_RAW_SOCKETS_PER_IFACE; -extern const isc::log::MessageID DHCPSRV_MYSQL_ADD_ADDR4; -extern const isc::log::MessageID DHCPSRV_MYSQL_ADD_ADDR6; -extern const isc::log::MessageID DHCPSRV_MYSQL_COMMIT; -extern const isc::log::MessageID DHCPSRV_MYSQL_DELETED_EXPIRED_RECLAIMED; -extern const isc::log::MessageID DHCPSRV_MYSQL_DELETE_ADDR; -extern const isc::log::MessageID DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED4; -extern const isc::log::MessageID DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED6; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET4; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET6; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_ADDR4; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_ADDR6; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_CLIENTID; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_DUID; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_EXPIRED4; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_EXPIRED6; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_HOSTNAME4; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_HOSTNAME6; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_HWADDR; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_IAID_DUID; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_IAID_SUBID_DUID; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_PAGE4; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_PAGE6; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_RELAYID4; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_RELAYID6; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_REMOTEID4; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_REMOTEID6; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_SUBID4; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_SUBID6; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_SUBID_CLIENTID; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_SUBID_HWADDR; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_SUBID_PAGE6; -extern const isc::log::MessageID DHCPSRV_MYSQL_GET_VERSION; -extern const isc::log::MessageID DHCPSRV_MYSQL_HOST_DB_GET_VERSION; -extern const isc::log::MessageID DHCPSRV_MYSQL_HOST_DB_READONLY; -extern const isc::log::MessageID DHCPSRV_MYSQL_HOST_DB_RECONNECT_ATTEMPT_FAILED; -extern const isc::log::MessageID DHCPSRV_MYSQL_HOST_DB_RECONNECT_ATTEMPT_SCHEDULE; -extern const isc::log::MessageID DHCPSRV_MYSQL_HOST_DB_RECONNECT_FAILED; -extern const isc::log::MessageID DHCPSRV_MYSQL_LEASE_DB_RECONNECT_ATTEMPT_FAILED; -extern const isc::log::MessageID DHCPSRV_MYSQL_LEASE_DB_RECONNECT_ATTEMPT_SCHEDULE; -extern const isc::log::MessageID DHCPSRV_MYSQL_LEASE_DB_RECONNECT_FAILED; -extern const isc::log::MessageID DHCPSRV_MYSQL_NEGATIVE_LEASES_STAT; -extern const isc::log::MessageID DHCPSRV_MYSQL_NO_TLS; -extern const isc::log::MessageID DHCPSRV_MYSQL_ROLLBACK; -extern const isc::log::MessageID DHCPSRV_MYSQL_TLS_CIPHER; -extern const isc::log::MessageID DHCPSRV_MYSQL_UPDATE_ADDR4; -extern const isc::log::MessageID DHCPSRV_MYSQL_UPDATE_ADDR6; -extern const isc::log::MessageID DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4; -extern const isc::log::MessageID DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4_ERROR; -extern const isc::log::MessageID DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4_PAGE; -extern const isc::log::MessageID DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6; -extern const isc::log::MessageID DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6_ERROR; -extern const isc::log::MessageID DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6_PAGE; extern const isc::log::MessageID DHCPSRV_NOTYPE_DB; extern const isc::log::MessageID DHCPSRV_NO_SOCKETS_OPEN; extern const isc::log::MessageID DHCPSRV_OPEN_SOCKET_FAIL; -extern const isc::log::MessageID DHCPSRV_PGSQL_ADD_ADDR4; -extern const isc::log::MessageID DHCPSRV_PGSQL_ADD_ADDR6; -extern const isc::log::MessageID DHCPSRV_PGSQL_COMMIT; -extern const isc::log::MessageID DHCPSRV_PGSQL_DELETE_ADDR; -extern const isc::log::MessageID DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED4; -extern const isc::log::MessageID DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED6; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET4; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET6; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_ADDR4; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_ADDR6; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_CLIENTID; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_DUID; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_EXPIRED4; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_EXPIRED6; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_HOSTNAME4; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_HOSTNAME6; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_HWADDR; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_IAID_DUID; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_IAID_SUBID_DUID; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_PAGE4; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_PAGE6; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_RELAYID4; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_RELAYID6; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_REMOTEID4; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_REMOTEID6; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_SUBID4; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_SUBID6; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_SUBID_CLIENTID; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_SUBID_HWADDR; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_SUBID_PAGE6; -extern const isc::log::MessageID DHCPSRV_PGSQL_GET_VERSION; -extern const isc::log::MessageID DHCPSRV_PGSQL_HOST_DB_GET_VERSION; -extern const isc::log::MessageID DHCPSRV_PGSQL_HOST_DB_READONLY; -extern const isc::log::MessageID DHCPSRV_PGSQL_HOST_DB_RECONNECT_ATTEMPT_FAILED; -extern const isc::log::MessageID DHCPSRV_PGSQL_HOST_DB_RECONNECT_ATTEMPT_SCHEDULE; -extern const isc::log::MessageID DHCPSRV_PGSQL_HOST_DB_RECONNECT_FAILED; -extern const isc::log::MessageID DHCPSRV_PGSQL_LEASE_DB_RECONNECT_ATTEMPT_FAILED; -extern const isc::log::MessageID DHCPSRV_PGSQL_LEASE_DB_RECONNECT_ATTEMPT_SCHEDULE; -extern const isc::log::MessageID DHCPSRV_PGSQL_LEASE_DB_RECONNECT_FAILED; -extern const isc::log::MessageID DHCPSRV_PGSQL_NEGATIVE_LEASES_STAT; -extern const isc::log::MessageID DHCPSRV_PGSQL_NO_TLS_SUPPORT; -extern const isc::log::MessageID DHCPSRV_PGSQL_ROLLBACK; -extern const isc::log::MessageID DHCPSRV_PGSQL_TLS_SUPPORT; -extern const isc::log::MessageID DHCPSRV_PGSQL_UPDATE_ADDR4; -extern const isc::log::MessageID DHCPSRV_PGSQL_UPDATE_ADDR6; -extern const isc::log::MessageID DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4; -extern const isc::log::MessageID DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4_ERROR; -extern const isc::log::MessageID DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4_PAGE; -extern const isc::log::MessageID DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6; -extern const isc::log::MessageID DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6_ERROR; -extern const isc::log::MessageID DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6_PAGE; extern const isc::log::MessageID DHCPSRV_QUEUE_NCR; extern const isc::log::MessageID DHCPSRV_QUEUE_NCR_FAILED; extern const isc::log::MessageID DHCPSRV_QUEUE_NCR_SKIP; diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.mes b/src/lib/dhcpsrv/dhcpsrv_messages.mes index c3704f4b28..4171205f36 100644 --- a/src/lib/dhcpsrv/dhcpsrv_messages.mes +++ b/src/lib/dhcpsrv/dhcpsrv_messages.mes @@ -491,7 +491,13 @@ V6) is about to open a memory file lease database. The parameters of the connection including database name and username needed to access it (but not the password if any) are logged. -% DHCPSRV_MEMFILE_DELETE_ADDR deleting lease for address %1 +% DHCPSRV_MEMFILE_DELETE_ADDR4 deleting lease for address %1 +Logged at debug log level 50. +A debug message issued when the server is attempting to delete a lease +for the specified address from the memory file database for the specified +address. + +% DHCPSRV_MEMFILE_DELETE_ADDR6 deleting lease for address %1 Logged at debug log level 50. A debug message issued when the server is attempting to delete a lease for the specified address from the memory file database for the specified @@ -791,282 +797,6 @@ interfaces. It must be noted that this may lead to receiving and processing the same DHCP message multiple times, as it will be received by each socket individually. -% DHCPSRV_MYSQL_ADD_ADDR4 adding IPv4 lease with address %1 -Logged at debug log level 50. -A debug message issued when the server is about to add an IPv4 lease -with the specified address to the MySQL backend database. - -% DHCPSRV_MYSQL_ADD_ADDR6 adding IPv6 lease with address %1, lease type %2 -Logged at debug log level 50. -A debug message issued when the server is about to add an IPv6 lease -with the specified address to the MySQL backend database. - -% DHCPSRV_MYSQL_COMMIT committing to MySQL database -Logged at debug log level 50. -The code has issued a commit call. All outstanding transactions will be -committed to the database. Note that depending on the MySQL settings, -the commit may not include a write to disk. - -% DHCPSRV_MYSQL_DELETED_EXPIRED_RECLAIMED deleted %1 reclaimed leases from the database -Logged at debug log level 50. -A debug message issued when the server has removed a number of reclaimed -leases from the database. The number of removed leases is included in the -message. - -% DHCPSRV_MYSQL_DELETE_ADDR deleting lease for address %1 -Logged at debug log level 50. -A debug message issued when the server is attempting to delete a lease for -the specified address from the MySQL database for the specified address. - -% DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED4 deleting reclaimed IPv4 leases that expired more than %1 seconds ago -Logged at debug log level 50. -A debug message issued when the server is removing reclaimed DHCPv4 -leases which have expired longer than a specified period of time. -The argument is the amount of time Kea waits after a reclaimed -lease expires before considering its removal. - -% DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED6 deleting reclaimed IPv6 leases that expired more than %1 seconds ago -Logged at debug log level 50. -A debug message issued when the server is removing reclaimed DHCPv6 -leases which have expired longer than a specified period of time. -The argument is the amount of time Kea waits after a reclaimed -lease expires before considering its removal. - -% DHCPSRV_MYSQL_GET4 obtaining all IPv4 leases -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain all IPv4 -leases from the MySQL database. - -% DHCPSRV_MYSQL_GET6 obtaining all IPv6 leases -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain all IPv6 -leases from the MySQL database. - -% DHCPSRV_MYSQL_GET_ADDR4 obtaining IPv4 lease for address %1 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain an IPv4 -lease from the MySQL database for the specified address. - -% DHCPSRV_MYSQL_GET_ADDR6 obtaining IPv6 lease for address %1, lease type %2 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain an IPv6 -lease from the MySQL database for the specified address. - -% DHCPSRV_MYSQL_GET_CLIENTID obtaining IPv4 leases for client ID %1 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a set -of IPv4 leases from the MySQL database for a client with the specified -client identification. - -% DHCPSRV_MYSQL_GET_DUID obtaining IPv6 lease for duid %1, -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain an IPv6 -lease from the MySQL database for the specified duid. - -% DHCPSRV_MYSQL_GET_EXPIRED4 obtaining maximum %1 of expired IPv4 leases -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain expired -IPv4 leases to reclaim them. The maximum number of leases to be retrieved -is logged in the message. - -% DHCPSRV_MYSQL_GET_EXPIRED6 obtaining maximum %1 of expired IPv6 leases -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain expired -IPv6 leases to reclaim them. The maximum number of leases to be retrieved -is logged in the message. - -% DHCPSRV_MYSQL_GET_HOSTNAME4 obtaining IPv4 leases for hostname %1 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a set -of IPv4 leases from the MySQL database for a client with the specified -hostname. - -% DHCPSRV_MYSQL_GET_HOSTNAME6 obtaining IPv6 leases for hostname %1 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a set -of IPv6 leases from the MySQL database for a client with the specified -hostname. - -% DHCPSRV_MYSQL_GET_HWADDR obtaining IPv4 leases for hardware address %1 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a set -of IPv4 leases from the MySQL database for a client with the specified -hardware address. - -% DHCPSRV_MYSQL_GET_IAID_DUID obtaining IPv6 leases for IAID %1, DUID %2, lease type %3 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a set of IPv6 -leases from the MySQL database for a client with the specified IAID (Identity -Association ID) and DUID (DHCP Unique Identifier). - -% DHCPSRV_MYSQL_GET_IAID_SUBID_DUID obtaining IPv6 leases for IAID %1, Subnet ID %2, DUID %3, lease type %4 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain an IPv6 -lease from the MySQL database for a client with the specified IAID -(Identity Association ID), Subnet ID and DUID (DHCP Unique Identifier). - -% DHCPSRV_MYSQL_GET_PAGE4 obtaining at most %1 IPv4 leases starting from address %2 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a page -of leases beginning with the specified address. - -% DHCPSRV_MYSQL_GET_PAGE6 obtaining at most %1 IPv6 leases starting from address %2 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a page -of leases beginning with the specified address. - -% DHCPSRV_MYSQL_GET_RELAYID4 obtaining at most %1 IPv4 leases starting from address %2 with relay id %3 and cltt between %4 and %5 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a page of -IPv4 leases beginning with the specified address with a relay id and client -transaction time between start and end dates. - -% DHCPSRV_MYSQL_GET_RELAYID6 obtaining at most %1 IPv6 leases starting from address %2 with relay id %3 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a page of -IPv6 leases beginning with the specified address with a relay id. - -% DHCPSRV_MYSQL_GET_REMOTEID4 obtaining at most %1 IPv4 leases starting from address %2 with remote id %3 and cltt between %4 and %5 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a page of -IPv4 leases beginning with the specified address with a remote id and client -transaction time between start and end dates. - -% DHCPSRV_MYSQL_GET_REMOTEID6 obtaining at most %1 IPv6 leases starting from address %2 with remote id %3 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a page of -IPv6 leases beginning with the specified address with a remote id. - -% DHCPSRV_MYSQL_GET_SUBID4 obtaining IPv4 leases for subnet ID %1 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain all IPv4 -leases for a given subnet identifier from the MySQL database. - -% DHCPSRV_MYSQL_GET_SUBID6 obtaining IPv6 leases for subnet ID %1 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain all IPv6 -leases for a given subnet identifier from the MySQL database. - -% DHCPSRV_MYSQL_GET_SUBID_CLIENTID obtaining IPv4 lease for subnet ID %1 and client ID %2 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain an IPv4 -lease from the MySQL database for a client with the specified subnet ID -and client ID. - -% DHCPSRV_MYSQL_GET_SUBID_HWADDR obtaining IPv4 lease for subnet ID %1 and hardware address %2 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain an IPv4 -lease from the MySQL database for a client with the specified subnet ID -and hardware address. - -% DHCPSRV_MYSQL_GET_SUBID_PAGE6 obtaining at most %1 IPv6 leases starting from address %2 for subnet ID %3 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a page of -IPv6 leases from the MySQL database beginning with the specified address -for the specified subnet identifier. - -% DHCPSRV_MYSQL_GET_VERSION obtaining schema version information -Logged at debug log level 50. -A debug message issued when the server is about to obtain schema version -information from the MySQL database. - -% DHCPSRV_MYSQL_HOST_DB_GET_VERSION obtaining schema version information for the MySQL hosts database -Logged at debug log level 50. -A debug message issued when the server is about to obtain schema version -information from the MySQL hosts database. - -% DHCPSRV_MYSQL_HOST_DB_READONLY MySQL host database opened for read access only -This informational message is issued when the user has configured the MySQL -database in read-only mode. Kea will not be able to insert or modify -host reservations but will be able to retrieve existing ones and -assign them to the clients communicating with the server. - -% DHCPSRV_MYSQL_HOST_DB_RECONNECT_ATTEMPT_FAILED database reconnect failed: %1 -An error message issued when an attempt to reconnect has failed. - -% DHCPSRV_MYSQL_HOST_DB_RECONNECT_ATTEMPT_SCHEDULE scheduling attempt %1 of %2 in %3 milliseconds -An info message issued when the server is scheduling the next attempt to reconnect -to the database. This occurs when the server has lost database connectivity and -is attempting to reconnect automatically. - -% DHCPSRV_MYSQL_HOST_DB_RECONNECT_FAILED maximum number of database reconnect attempts: %1, has been exhausted without success -An error message issued when the server failed to reconnect. Loss of connectivity -is typically a network or database server issue. - -% DHCPSRV_MYSQL_LEASE_DB_RECONNECT_ATTEMPT_FAILED database reconnect failed: %1 -An error message issued when an attempt to reconnect has failed. - -% DHCPSRV_MYSQL_LEASE_DB_RECONNECT_ATTEMPT_SCHEDULE scheduling attempt %1 of %2 in %3 milliseconds -An info message issued when the server is scheduling the next attempt to reconnect -to the database. This occurs when the server has lost database connectivity and -is attempting to reconnect automatically. - -% DHCPSRV_MYSQL_LEASE_DB_RECONNECT_FAILED maximum number of database reconnect attempts: %1, has been exhausted without success -An error message issued when the server failed to reconnect. Loss of connectivity -is typically a network or database server issue. - -% DHCPSRV_MYSQL_NEGATIVE_LEASES_STAT recount of leases returned a negative value -This warning message is issued when the recount of leases using counters -in the MySQL database returned a negative value. This shows a problem -which can be fixed only by an offline direct recount on the database. -This message is issued only once. - -% DHCPSRV_MYSQL_NO_TLS TLS was required but is not used -This error message is issued when TLS for the connection was required but -TLS is not used. - -% DHCPSRV_MYSQL_ROLLBACK rolling back MySQL database -Logged at debug log level 50. -The code has issued a rollback call. All outstanding transaction will -be rolled back and not committed to the database. - -% DHCPSRV_MYSQL_TLS_CIPHER TLS cipher: %1 -Logged at debug log level 40. -A debug message issued when a new MySQL connected is created with TLS. -The TLS cipher name is logged. - -% DHCPSRV_MYSQL_UPDATE_ADDR4 updating IPv4 lease for address %1 -Logged at debug log level 50. -A debug message issued when the server is attempting to update IPv4 -lease from the MySQL database for the specified address. - -% DHCPSRV_MYSQL_UPDATE_ADDR6 updating IPv6 lease for address %1, lease type %2 -Logged at debug log level 50. -A debug message issued when the server is attempting to update IPv6 -lease from the MySQL database for the specified address. - -% DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4 upgrading IPv4 leases done in %1 pages with %2 updated leases -Logged at debug log level 40. -The server upgraded extended info. The number of pages and the final count of -updated leases are displayed. - -% DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4_ERROR upgrading extending info for IPv4 lease at %1 failed with %2 -Logged at debug log level 40. -A debug message issued when the server failed to upgrade an extended info. -The address of the lease and the error message are displayed. - -% DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4_PAGE upgrading IPv4 lease extended info at page %1 starting at %2 (updated %3) -Logged at debug log level 50. -A debug message issued when the server upgrades IPv4 lease extended info. -The page number and started address, and the count of already updated leases -are displayed. - -% DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6 upgrading IPv6 leases done in %1 pages with %2 updated leases -Logged at debug log level 40. -The server upgraded extended info. The number of pages and the final count of -updated leases are displayed. - -% DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6_ERROR upgrading extending info for IPv6 lease at %1 failed with %2 -Logged at debug log level 40. -A debug message issued when the server failed to upgrade the extended info -for a lease. The address of the lease and the error message are displayed. - -% DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6_PAGE upgrading IPv6 lease extended info at page %1 starting at %2 (updated %3) -Logged at debug log level 50. -A debug message issued when the server upgrades IPv6 lease extended info. -The page number and started address, and the count of already updated leases -are displayed. - % DHCPSRV_NOTYPE_DB no 'type' keyword to determine database backend: %1 This is an error message, logged when an attempt has been made to access a database backend, but where no 'type' keyword has been included in @@ -1082,278 +812,6 @@ configured to receive the traffic. A warning message issued when IfaceMgr fails to open and bind a socket. The reason for the failure is appended as an argument of the log message. -% DHCPSRV_PGSQL_ADD_ADDR4 adding IPv4 lease with address %1 -Logged at debug log level 50. -A debug message issued when the server is about to add an IPv4 lease -with the specified address to the PostgreSQL backend database. - -% DHCPSRV_PGSQL_ADD_ADDR6 adding IPv6 lease with address %1, lease type %2 -Logged at debug log level 50. -A debug message issued when the server is about to add an IPv6 lease -with the specified address to the PostgreSQL backend database. - -% DHCPSRV_PGSQL_COMMIT committing to PostgreSQL database -Logged at debug log level 50. -The code has issued a commit call. All outstanding transactions will be -committed to the database. Note that depending on the PostgreSQL settings, -the commit may not include a write to disk. - -% DHCPSRV_PGSQL_DELETE_ADDR deleting lease for address %1 -Logged at debug log level 50. -A debug message issued when the server is attempting to delete a lease for -the specified address from the PostgreSQL database for the specified address. - -% DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED4 deleting reclaimed IPv4 leases that expired more than %1 seconds ago -Logged at debug log level 50. -A debug message issued when the server is removing reclaimed DHCPv4 -leases which have expired longer than a specified period of time. -The argument is the amount of time Kea waits after a reclaimed -lease expires before considering its removal. - -% DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED6 deleting reclaimed IPv6 leases that expired more than %1 seconds ago -Logged at debug log level 50. -A debug message issued when the server is removing reclaimed DHCPv6 -leases which have expired longer than a specified period of time. -The argument is the amount of time Kea waits after a reclaimed -lease expires before considering its removal. - -% DHCPSRV_PGSQL_GET4 obtaining all IPv4 leases -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain all IPv4 -leases from the PostgreSQL database. - -% DHCPSRV_PGSQL_GET6 obtaining all IPv6 leases -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain all IPv6 -leases from the PostgreSQL database. - -% DHCPSRV_PGSQL_GET_ADDR4 obtaining IPv4 lease for address %1 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain an IPv4 -lease from the PostgreSQL database for the specified address. - -% DHCPSRV_PGSQL_GET_ADDR6 obtaining IPv6 lease for address %1 (lease type %2) -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain an IPv6 -lease from the PostgreSQL database for the specified address. - -% DHCPSRV_PGSQL_GET_CLIENTID obtaining IPv4 leases for client ID %1 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a set -of IPv4 leases from the PostgreSQL database for a client with the specified -client identification. - -% DHCPSRV_PGSQL_GET_DUID obtaining IPv6 leases for DUID %1, -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a set of IPv6 -leases from the PostgreSQL database for a client with the specified DUID (DHCP Unique Identifier). - -% DHCPSRV_PGSQL_GET_EXPIRED4 obtaining maximum %1 of expired IPv4 leases -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain expired -IPv4 leases to reclaim them. The maximum number of leases to be retrieved -is logged in the message. - -% DHCPSRV_PGSQL_GET_EXPIRED6 obtaining maximum %1 of expired IPv6 leases -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain expired -IPv6 leases to reclaim them. The maximum number of leases to be retrieved -is logged in the message. - -% DHCPSRV_PGSQL_GET_HOSTNAME4 obtaining IPv4 leases for hostname %1 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a set -of IPv4 leases from the PostgreSQL database for a client with the specified -hostname. - -% DHCPSRV_PGSQL_GET_HOSTNAME6 obtaining IPv6 leases for hostname %1 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a set -of IPv6 leases from the PostgreSQL database for a client with the specified -hostname. - -% DHCPSRV_PGSQL_GET_HWADDR obtaining IPv4 leases for hardware address %1 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a set -of IPv4 leases from the PostgreSQL database for a client with the specified -hardware address. - -% DHCPSRV_PGSQL_GET_IAID_DUID obtaining IPv4 leases for IAID %1 and DUID %2, lease type %3 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a set of IPv6 -leases from the PostgreSQL database for a client with the specified IAID -(Identity Association ID) and DUID (DHCP Unique Identifier). - -% DHCPSRV_PGSQL_GET_IAID_SUBID_DUID obtaining IPv4 leases for IAID %1, Subnet ID %2, DUID %3, and lease type %4 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain an IPv6 -lease from the PostgreSQL database for a client with the specified IAID -(Identity Association ID), Subnet ID and DUID (DHCP Unique Identifier). - -% DHCPSRV_PGSQL_GET_PAGE4 obtaining at most %1 IPv4 leases starting from address %2 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a page -of leases beginning with the specified address. - -% DHCPSRV_PGSQL_GET_PAGE6 obtaining at most %1 IPv6 leases starting from address %2 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a page -of leases beginning with the specified address. - -% DHCPSRV_PGSQL_GET_RELAYID4 obtaining at most %1 IPv4 leases starting from address %2 with relay id %3 and cltt between %4 and %5 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a page of -IPv4 leases beginning with the specified address with a relay id and client -transaction time between start and end dates. - -% DHCPSRV_PGSQL_GET_RELAYID6 obtaining at most %1 IPv6 leases starting from address %2 with relay id %3 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a page of -IPv6 leases beginning with the specified address with a relay id. - -% DHCPSRV_PGSQL_GET_REMOTEID4 obtaining at most %1 IPv4 leases starting from address %2 with remote id %3 and cltt between %4 and %5 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a page of -IPv4 leases beginning with the specified address with a remote id and client -transaction time between start and end dates. - -% DHCPSRV_PGSQL_GET_REMOTEID6 obtaining at most %1 IPv6 leases starting from address %2 with remote id %3 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a page of -IPv6 leases beginning with the specified address with a remote id. - -% DHCPSRV_PGSQL_GET_SUBID4 obtaining IPv4 leases for subnet ID %1 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain all IPv4 -leases for a given subnet identifier from the PostgreSQL database. - -% DHCPSRV_PGSQL_GET_SUBID6 obtaining IPv6 leases for subnet ID %1 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain all IPv6 -leases for a given subnet identifier from the PostgreSQL database. - -% DHCPSRV_PGSQL_GET_SUBID_CLIENTID obtaining IPv4 lease for subnet ID %1 and client ID %2 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain an IPv4 -lease from the PostgreSQL database for a client with the specified subnet ID -and client ID. - -% DHCPSRV_PGSQL_GET_SUBID_HWADDR obtaining IPv4 lease for subnet ID %1 and hardware address %2 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain an IPv4 -lease from the PostgreSQL database for a client with the specified subnet ID -and hardware address. - -% DHCPSRV_PGSQL_GET_SUBID_PAGE6 obtaining at most %1 IPv6 leases starting from address %2 for subnet ID %3 -Logged at debug log level 50. -A debug message issued when the server is attempting to obtain a page of -IPv6 leases from the PostgreSQL database beginning with the specified address -for the specified subnet identifier. - -% DHCPSRV_PGSQL_GET_VERSION obtaining schema version information -Logged at debug log level 50. -A debug message issued when the server is about to obtain schema version -information from the PostgreSQL database. - -% DHCPSRV_PGSQL_HOST_DB_GET_VERSION obtaining schema version information for the PostgreSQL hosts database -Logged at debug log level 50. -A debug message issued when the server is about to obtain schema version -information from the PostgreSQL hosts database. - -% DHCPSRV_PGSQL_HOST_DB_READONLY PostgreSQL host database opened for read access only -This informational message is issued when the user has configured the PostgreSQL -database in read-only mode. Kea will not be able to insert or modify -host reservations but will be able to retrieve existing ones and -assign them to the clients communicating with the server. - -% DHCPSRV_PGSQL_HOST_DB_RECONNECT_ATTEMPT_FAILED database reconnect failed: %1 -An error message issued when an attempt to reconnect has failed. - -% DHCPSRV_PGSQL_HOST_DB_RECONNECT_ATTEMPT_SCHEDULE scheduling attempt %1 of %2 in %3 milliseconds -An info message issued when the server is scheduling the next attempt to reconnect -to the database. This occurs when the server has lost database connectivity and -is attempting to reconnect automatically. - -% DHCPSRV_PGSQL_HOST_DB_RECONNECT_FAILED maximum number of database reconnect attempts: %1, has been exhausted without success -An error message issued when the server failed to reconnect. Loss of connectivity -is typically a network or database server issue. - -% DHCPSRV_PGSQL_LEASE_DB_RECONNECT_ATTEMPT_FAILED database reconnect failed: %1 -An error message issued when an attempt to reconnect has failed. - -% DHCPSRV_PGSQL_LEASE_DB_RECONNECT_ATTEMPT_SCHEDULE scheduling attempt %1 of %2 in %3 milliseconds -An info message issued when the server is scheduling the next attempt to reconnect -to the database. This occurs when the server has lost database connectivity and -is attempting to reconnect automatically. - -% DHCPSRV_PGSQL_LEASE_DB_RECONNECT_FAILED maximum number of database reconnect attempts: %1, has been exhausted without success -An error message issued when the server failed to reconnect. Loss of connectivity -is typically a network or database server issue. - -% DHCPSRV_PGSQL_NEGATIVE_LEASES_STAT recount of leases returned a negative value -This warning message is issued when the recount of leases using counters -in the PostgreSQL database returned a negative value. This shows a problem -which can be fixed only by an offline direct recount on the database. -This message is issued only once. - -% DHCPSRV_PGSQL_NO_TLS_SUPPORT Attempt to configure TLS (unsupported for PostgreSQL): %1 -This error message is printed when TLS support was required in the Kea -configuration: Kea was built with this feature disabled for PostgreSQL. -The parameters of the connection are logged. - -% DHCPSRV_PGSQL_ROLLBACK rolling back PostgreSQL database -Logged at debug log level 50. -The code has issued a rollback call. All outstanding transaction will -be rolled back and not committed to the database. - -% DHCPSRV_PGSQL_TLS_SUPPORT Attempt to configure TLS: %1 -This informational message is printed when TLS support was required in -the Kea configuration: The TLS support in PostgreSQL will be initialized but -its configuration is fully managed outside the C API. -The parameters of the connection are logged. - -% DHCPSRV_PGSQL_UPDATE_ADDR4 updating IPv4 lease for address %1 -Logged at debug log level 50. -A debug message issued when the server is attempting to update IPv4 -lease from the PostgreSQL database for the specified address. - -% DHCPSRV_PGSQL_UPDATE_ADDR6 updating IPv6 lease for address %1, lease type %2 -Logged at debug log level 50. -A debug message issued when the server is attempting to update IPv6 -lease from the PostgreSQL database for the specified address. - -% DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4 upgrading IPv4 leases done in %1 pages with %2 updated leases -Logged at debug log level 40. -The server upgraded extended info. The number of pages and the final count of -updated leases are displayed. - -% DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4_ERROR upgrading extending info for IPv4 lease at %1 failed with %2 -Logged at debug log level 40. -A debug message issued when the server failed to upgrade an extended info. -The address of the lease and the error message are displayed. - -% DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4_PAGE upgrading IPv4 lease extended info at page %1 starting at %2 (updated %3) -Logged at debug log level 50. -A debug message issued when the server upgrades IPv4 lease extended info. -The page number and started address, and the count of already updated leases -are displayed. - -% DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6 upgrading IPv6 leases done in %1 pages with %2 updated leases -Logged at debug log level 40. -The server upgraded extended info. The number of pages and the final count of -updated leases are displayed. - -% DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6_ERROR upgrading extending info for IPv6 lease at %1 failed with %2 -Logged at debug log level 40. -A debug message issued when the server failed to upgrade the extended info -for a lease. The address of the lease and the error message are displayed. - -% DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6_PAGE upgrading IPv6 lease extended info at page %1 starting at %2 (updated %3) -Logged at debug log level 50. -A debug message issued when the server upgrades IPv6 lease extended info. -The page number and started address, and the count of already updated leases -are displayed. - % DHCPSRV_QUEUE_NCR %1: Name change request to %2 DNS entry queued: %3 Logged at debug log level 50. A debug message which is logged when the NameChangeRequest to add or remove diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.cc b/src/lib/dhcpsrv/memfile_lease_mgr.cc index 83542dc0ca..63c9c515a7 100644 --- a/src/lib/dhcpsrv/memfile_lease_mgr.cc +++ b/src/lib/dhcpsrv/memfile_lease_mgr.cc @@ -2007,7 +2007,7 @@ Memfile_LeaseMgr::deleteLeaseInternal(const Lease4Ptr& lease) { bool Memfile_LeaseMgr::deleteLease(const Lease4Ptr& lease) { LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, - DHCPSRV_MEMFILE_DELETE_ADDR).arg(lease->addr_.toText()); + DHCPSRV_MEMFILE_DELETE_ADDR4).arg(lease->addr_.toText()); if (MultiThreadingMgr::instance().getMode()) { std::lock_guard lock(*mutex_); @@ -2066,7 +2066,7 @@ Memfile_LeaseMgr::deleteLeaseInternal(const Lease6Ptr& lease) { bool Memfile_LeaseMgr::deleteLease(const Lease6Ptr& lease) { LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, - DHCPSRV_MEMFILE_DELETE_ADDR).arg(lease->addr_.toText()); + DHCPSRV_MEMFILE_DELETE_ADDR6).arg(lease->addr_.toText()); if (MultiThreadingMgr::instance().getMode()) { std::lock_guard lock(*mutex_);