[#3536] fix check-messages

diff --git a/doc/sphinx/debug-messages.rst b/doc/sphinx/debug-messages.rst
index 5c71ff85b309eb9e4c70d0566cb04ebcb4bb9773..4ceac072a34d2a55efffcdf50714d944a490a840 100644 (file)
--- a/doc/sphinx/debug-messages.rst
+++ b/doc/sphinx/debug-messages.rst
@@ -249,15 +249,6 @@ Messages printed on debuglevel 40
 - DHCPSRV_MEMFILE_EXTRACT_EXTENDED_INFO4
 - DHCPSRV_MEMFILE_EXTRACT_EXTENDED_INFO4_ERROR
 - DHCPSRV_MEMFILE_LFC_UNREGISTER_TIMER_FAILED
-- DHCPSRV_MYSQL_TLS_CIPHER
-- DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4
-- DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4_ERROR
-- DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6
-- DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6_ERROR
-- DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4
-- DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4_ERROR
-- DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6
-- DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6_ERROR
 - DHCPSRV_SUBNET4O6_SELECT_FAILED
 - DHCPSRV_SUBNET4_SELECT_BY_ADDRESS_NO_MATCH
 - DHCPSRV_SUBNET4_SELECT_BY_INTERFACE_NO_MATCH
@@ -333,15 +324,35 @@ Messages printed on debuglevel 40
 - HOSTS_CFG_DEL6
 - HOSTS_CFG_DEL_ALL_SUBNET4
 - HOSTS_CFG_DEL_ALL_SUBNET6
+- HOSTS_CFG_GET_ALL
+- HOSTS_CFG_GET_ALL_ADDRESS4
+- HOSTS_CFG_GET_ALL_ADDRESS6
+- HOSTS_CFG_GET_ALL_HOSTNAME
+- HOSTS_CFG_GET_ALL_HOSTNAME_SUBNET_ID4
+- HOSTS_CFG_GET_ALL_HOSTNAME_SUBNET_ID6
+- HOSTS_CFG_GET_ALL_IDENTIFIER
+- HOSTS_CFG_GET_ALL_SUBNET_ID4
+- HOSTS_CFG_GET_ALL_SUBNET_ID6
+- HOSTS_CFG_GET_ALL_SUBNET_ID_ADDRESS4
+- HOSTS_CFG_GET_ALL_SUBNET_ID_ADDRESS6
 - HOSTS_CFG_GET_ONE_PREFIX
+- HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS4
+- HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS6
+- HOSTS_CFG_GET_ONE_SUBNET_ID_IDENTIFIER
 - HOSTS_CFG_UPDATE_ADD
 - HOSTS_CFG_UPDATE_DEL4
 - HOSTS_CFG_UPDATE_DEL6
 - HOSTS_MGR_ALTERNATE_GET4_SUBNET_ID_ADDRESS4
+- HOSTS_MGR_ALTERNATE_GET4_SUBNET_ID_IDENTIFIER
 - HOSTS_MGR_ALTERNATE_GET6_PREFIX
 - HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_ADDRESS6
+- HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_IDENTIFIER
 - HOSTS_MGR_ALTERNATE_GET_ALL_SUBNET_ID_ADDRESS4
 - HOSTS_MGR_ALTERNATE_GET_ALL_SUBNET_ID_ADDRESS6
+- HOST_CACHE_GET_ONE_PREFIX
+- HOST_CACHE_GET_ONE_SUBNET_ID_ADDRESS4
+- HOST_CACHE_GET_ONE_SUBNET_ID_ADDRESS6
+- HOST_CACHE_GET_ONE_SUBNET_ID_IDENTIFIER
 - HTTP_BAD_CLIENT_REQUEST_RECEIVED
 - HTTP_BAD_SERVER_RESPONSE_RECEIVED
 - HTTP_CLIENT_MT_STARTED
@@ -548,6 +559,12 @@ Messages printed on debuglevel 40
 - MYSQL_CB_TLS_CIPHER
 - MYSQL_CB_UNREGISTER_BACKEND_TYPE4
 - MYSQL_CB_UNREGISTER_BACKEND_TYPE6
+- MYSQL_HB_TLS_CIPHER
+- MYSQL_LB_TLS_CIPHER
+- MYSQL_LB_UPGRADE_EXTENDED_INFO4
+- MYSQL_LB_UPGRADE_EXTENDED_INFO4_ERROR
+- MYSQL_LB_UPGRADE_EXTENDED_INFO6
+- MYSQL_LB_UPGRADE_EXTENDED_INFO6_ERROR
 - PERFMON_DHCP4_SOCKET_RECEIVED_TIME_SUPPORT
 - PERFMON_DHCP6_SOCKET_RECEIVED_TIME_SUPPORT
 - PGSQL_CB_CREATE_UPDATE_BY_POOL_OPTION4
@@ -731,6 +748,10 @@ Messages printed on debuglevel 40
 - PGSQL_CB_REGISTER_BACKEND_TYPE6
 - PGSQL_CB_UNREGISTER_BACKEND_TYPE4
 - PGSQL_CB_UNREGISTER_BACKEND_TYPE6
+- PGSQL_LB_UPGRADE_EXTENDED_INFO4
+- PGSQL_LB_UPGRADE_EXTENDED_INFO4_ERROR
+- PGSQL_LB_UPGRADE_EXTENDED_INFO6
+- PGSQL_LB_UPGRADE_EXTENDED_INFO6_ERROR
 - PING_CHECK_CHANNEL_MALFORMED_PACKET_RECEIVED
 - PING_CHECK_CHANNEL_SOCKET_CLOSED
 - PING_CHECK_CHANNEL_SOCKET_OPENED
@@ -837,42 +858,25 @@ Messages printed on debuglevel 45
 - HOOKS_LIBRARY_MULTI_THREADING_COMPATIBLE
 - HOOKS_LIBRARY_VERSION
 - HOOKS_STD_CALLOUT_REGISTERED
-- HOSTS_CFG_GET_ALL
-- HOSTS_CFG_GET_ALL_ADDRESS4
 - HOSTS_CFG_GET_ALL_ADDRESS4_COUNT
-- HOSTS_CFG_GET_ALL_ADDRESS6
 - HOSTS_CFG_GET_ALL_ADDRESS6_COUNT
 - HOSTS_CFG_GET_ALL_COUNT
-- HOSTS_CFG_GET_ALL_HOST
-- HOSTS_CFG_GET_ALL_HOSTNAME
 - HOSTS_CFG_GET_ALL_HOSTNAME_COUNT
-- HOSTS_CFG_GET_ALL_HOSTNAME_SUBNET_ID4
 - HOSTS_CFG_GET_ALL_HOSTNAME_SUBNET_ID4_COUNT
-- HOSTS_CFG_GET_ALL_HOSTNAME_SUBNET_ID6
 - HOSTS_CFG_GET_ALL_HOSTNAME_SUBNET_ID6_COUNT
-- HOSTS_CFG_GET_ALL_IDENTIFIER
 - HOSTS_CFG_GET_ALL_IDENTIFIER_COUNT
-- HOSTS_CFG_GET_ALL_SUBNET_ID4
 - HOSTS_CFG_GET_ALL_SUBNET_ID4_COUNT
-- HOSTS_CFG_GET_ALL_SUBNET_ID6
 - HOSTS_CFG_GET_ALL_SUBNET_ID6_COUNT
-- HOSTS_CFG_GET_ALL_SUBNET_ID_ADDRESS4
 - HOSTS_CFG_GET_ALL_SUBNET_ID_ADDRESS4_COUNT
-- HOSTS_CFG_GET_ALL_SUBNET_ID_ADDRESS6
 - HOSTS_CFG_GET_ALL_SUBNET_ID_ADDRESS6_COUNT
-- HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS4
 - HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS4_HOST
 - HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS4_NULL
-- HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS6
 - HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS6_HOST
 - HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS6_NULL
-- HOSTS_CFG_GET_ONE_SUBNET_ID_IDENTIFIER
 - HOSTS_CFG_GET_ONE_SUBNET_ID_IDENTIFIER_HOST
 - HOSTS_CFG_GET_ONE_SUBNET_ID_IDENTIFIER_NULL
-- HOSTS_MGR_ALTERNATE_GET4_SUBNET_ID_IDENTIFIER
 - HOSTS_MGR_ALTERNATE_GET4_SUBNET_ID_IDENTIFIER_HOST
 - HOSTS_MGR_ALTERNATE_GET4_SUBNET_ID_IDENTIFIER_NULL
-- HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_IDENTIFIER
 - HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_IDENTIFIER_HOST
 - HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_IDENTIFIER_NULL
 - HOST_CACHE_ADD
@@ -881,13 +885,9 @@ Messages printed on debuglevel 45
 - HOST_CACHE_DEL_SUBNET_ID_ADDRESS6
 - HOST_CACHE_DEL_SUBNET_ID_IDENTIFIER4
 - HOST_CACHE_DEL_SUBNET_ID_IDENTIFIER6
-- HOST_CACHE_GET_ONE_PREFIX
 - HOST_CACHE_GET_ONE_PREFIX_HOST
-- HOST_CACHE_GET_ONE_SUBNET_ID_ADDRESS4
 - HOST_CACHE_GET_ONE_SUBNET_ID_ADDRESS4_HOST
-- HOST_CACHE_GET_ONE_SUBNET_ID_ADDRESS6
 - HOST_CACHE_GET_ONE_SUBNET_ID_ADDRESS6_HOST
-- HOST_CACHE_GET_ONE_SUBNET_ID_IDENTIFIER
 - HOST_CACHE_GET_ONE_SUBNET_ID_IDENTIFIER_HOST
 - HTTP_BAD_CLIENT_REQUEST_RECEIVED_DETAILS
 - HTTP_BAD_SERVER_RESPONSE_RECEIVED_DETAILS
@@ -971,7 +971,8 @@ Messages printed on debuglevel 50
 - DHCPSRV_MEMFILE_ADD_ADDR4
 - DHCPSRV_MEMFILE_ADD_ADDR6
 - DHCPSRV_MEMFILE_COMMIT
-- DHCPSRV_MEMFILE_DELETE_ADDR
+- DHCPSRV_MEMFILE_DELETE_ADDR4
+- DHCPSRV_MEMFILE_DELETE_ADDR6
 - DHCPSRV_MEMFILE_DELETE_EXPIRED_RECLAIMED4
 - DHCPSRV_MEMFILE_DELETE_EXPIRED_RECLAIMED6
 - DHCPSRV_MEMFILE_DELETE_EXPIRED_RECLAIMED_START
@@ -1002,84 +1003,6 @@ Messages printed on debuglevel 50
 - DHCPSRV_MEMFILE_ROLLBACK
 - DHCPSRV_MEMFILE_UPDATE_ADDR4
 - DHCPSRV_MEMFILE_UPDATE_ADDR6
-- DHCPSRV_MYSQL_ADD_ADDR4
-- DHCPSRV_MYSQL_ADD_ADDR6
-- DHCPSRV_MYSQL_COMMIT
-- DHCPSRV_MYSQL_DELETED_EXPIRED_RECLAIMED
-- DHCPSRV_MYSQL_DELETE_ADDR
-- DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED4
-- DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED6
-- DHCPSRV_MYSQL_GET4
-- DHCPSRV_MYSQL_GET6
-- DHCPSRV_MYSQL_GET_ADDR4
-- DHCPSRV_MYSQL_GET_ADDR6
-- DHCPSRV_MYSQL_GET_CLIENTID
-- DHCPSRV_MYSQL_GET_DUID
-- DHCPSRV_MYSQL_GET_EXPIRED4
-- DHCPSRV_MYSQL_GET_EXPIRED6
-- DHCPSRV_MYSQL_GET_HOSTNAME4
-- DHCPSRV_MYSQL_GET_HOSTNAME6
-- DHCPSRV_MYSQL_GET_HWADDR
-- DHCPSRV_MYSQL_GET_IAID_DUID
-- DHCPSRV_MYSQL_GET_IAID_SUBID_DUID
-- DHCPSRV_MYSQL_GET_PAGE4
-- DHCPSRV_MYSQL_GET_PAGE6
-- DHCPSRV_MYSQL_GET_RELAYID4
-- DHCPSRV_MYSQL_GET_RELAYID6
-- DHCPSRV_MYSQL_GET_REMOTEID4
-- DHCPSRV_MYSQL_GET_REMOTEID6
-- DHCPSRV_MYSQL_GET_SUBID4
-- DHCPSRV_MYSQL_GET_SUBID6
-- DHCPSRV_MYSQL_GET_SUBID_CLIENTID
-- DHCPSRV_MYSQL_GET_SUBID_HWADDR
-- DHCPSRV_MYSQL_GET_SUBID_PAGE6
-- DHCPSRV_MYSQL_GET_VERSION
-- DHCPSRV_MYSQL_HOST_DB
-- DHCPSRV_MYSQL_HOST_DB_GET_VERSION
-- DHCPSRV_MYSQL_ROLLBACK
-- DHCPSRV_MYSQL_UPDATE_ADDR4
-- DHCPSRV_MYSQL_UPDATE_ADDR6
-- DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO4_PAGE
-- DHCPSRV_MYSQL_UPGRADE_EXTENDED_INFO6_PAGE
-- DHCPSRV_PGSQL_ADD_ADDR4
-- DHCPSRV_PGSQL_ADD_ADDR6
-- DHCPSRV_PGSQL_COMMIT
-- DHCPSRV_PGSQL_DELETE_ADDR
-- DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED4
-- DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED6
-- DHCPSRV_PGSQL_GET4
-- DHCPSRV_PGSQL_GET6
-- DHCPSRV_PGSQL_GET_ADDR4
-- DHCPSRV_PGSQL_GET_ADDR6
-- DHCPSRV_PGSQL_GET_CLIENTID
-- DHCPSRV_PGSQL_GET_DUID
-- DHCPSRV_PGSQL_GET_EXPIRED4
-- DHCPSRV_PGSQL_GET_EXPIRED6
-- DHCPSRV_PGSQL_GET_HOSTNAME4
-- DHCPSRV_PGSQL_GET_HOSTNAME6
-- DHCPSRV_PGSQL_GET_HWADDR
-- DHCPSRV_PGSQL_GET_IAID_DUID
-- DHCPSRV_PGSQL_GET_IAID_SUBID_DUID
-- DHCPSRV_PGSQL_GET_PAGE4
-- DHCPSRV_PGSQL_GET_PAGE6
-- DHCPSRV_PGSQL_GET_RELAYID4
-- DHCPSRV_PGSQL_GET_RELAYID6
-- DHCPSRV_PGSQL_GET_REMOTEID4
-- DHCPSRV_PGSQL_GET_REMOTEID6
-- DHCPSRV_PGSQL_GET_SUBID4
-- DHCPSRV_PGSQL_GET_SUBID6
-- DHCPSRV_PGSQL_GET_SUBID_CLIENTID
-- DHCPSRV_PGSQL_GET_SUBID_HWADDR
-- DHCPSRV_PGSQL_GET_SUBID_PAGE6
-- DHCPSRV_PGSQL_GET_VERSION
-- DHCPSRV_PGSQL_HOST_DB
-- DHCPSRV_PGSQL_HOST_DB_GET_VERSION
-- DHCPSRV_PGSQL_ROLLBACK
-- DHCPSRV_PGSQL_UPDATE_ADDR4
-- DHCPSRV_PGSQL_UPDATE_ADDR6
-- DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO4_PAGE
-- DHCPSRV_PGSQL_UPGRADE_EXTENDED_INFO6_PAGE
-- DHCPSRV_QUEUE_NCR
 - DHCPSRV_QUEUE_NCR_SKIP
 - DHCPSRV_TEMPLATE_EVAL_RESULT
 - DHCPSRV_TIMERMGR_RUN_TIMER_OPERATION
@@ -1100,10 +1023,87 @@ Messages printed on debuglevel 50
 - LEGAL_LOG_MYSQL_TLS_CIPHER
 - LEGAL_LOG_PGSQL_GET_VERSION
 - LEGAL_LOG_PGSQL_INSERT_LOG
+- MYSQL_HB_DB_GET_VERSION
+- MYSQL_LB_ADD_ADDR4
+- MYSQL_LB_ADD_ADDR6
+- MYSQL_LB_COMMIT
+- MYSQL_LB_DELETED_EXPIRED_RECLAIMED
+- MYSQL_LB_DELETE_ADDR4
+- MYSQL_LB_DELETE_ADDR6
+- MYSQL_LB_DELETE_EXPIRED_RECLAIMED4
+- MYSQL_LB_DELETE_EXPIRED_RECLAIMED6
+- MYSQL_LB_GET4
+- MYSQL_LB_GET6
+- MYSQL_LB_GET_ADDR4
+- MYSQL_LB_GET_ADDR6
+- MYSQL_LB_GET_CLIENTID
+- MYSQL_LB_GET_DUID
+- MYSQL_LB_GET_EXPIRED4
+- MYSQL_LB_GET_EXPIRED6
+- MYSQL_LB_GET_HOSTNAME4
+- MYSQL_LB_GET_HOSTNAME6
+- MYSQL_LB_GET_HWADDR
+- MYSQL_LB_GET_IAID_DUID
+- MYSQL_LB_GET_IAID_SUBID_DUID
+- MYSQL_LB_GET_PAGE4
+- MYSQL_LB_GET_PAGE6
+- MYSQL_LB_GET_RELAYID4
+- MYSQL_LB_GET_RELAYID6
+- MYSQL_LB_GET_REMOTEID4
+- MYSQL_LB_GET_REMOTEID6
+- MYSQL_LB_GET_SUBID4
+- MYSQL_LB_GET_SUBID6
+- MYSQL_LB_GET_SUBID_CLIENTID
+- MYSQL_LB_GET_SUBID_HWADDR
+- MYSQL_LB_GET_SUBID_PAGE6
+- MYSQL_LB_GET_VERSION
+- MYSQL_LB_ROLLBACK
+- MYSQL_LB_UPDATE_ADDR4
+- MYSQL_LB_UPDATE_ADDR6
+- MYSQL_LB_UPGRADE_EXTENDED_INFO4_PAGE
+- MYSQL_LB_UPGRADE_EXTENDED_INFO6_PAGE
 - PERFMON_DHCP4_PKT_EVENTS
 - PERFMON_DHCP4_PKT_PROCESS_ERROR
 - PERFMON_DHCP6_PKT_EVENTS
 - PERFMON_DHCP6_PKT_PROCESS_ERROR
+- PGSQL_HB_DB_GET_VERSION
+- PGSQL_LB_ADD_ADDR4
+- PGSQL_LB_ADD_ADDR6
+- PGSQL_LB_COMMIT
+- PGSQL_LB_DELETE_ADDR4
+- PGSQL_LB_DELETE_ADDR6
+- PGSQL_LB_DELETE_EXPIRED_RECLAIMED4
+- PGSQL_LB_DELETE_EXPIRED_RECLAIMED6
+- PGSQL_LB_GET4
+- PGSQL_LB_GET6
+- PGSQL_LB_GET_ADDR4
+- PGSQL_LB_GET_ADDR6
+- PGSQL_LB_GET_CLIENTID
+- PGSQL_LB_GET_DUID
+- PGSQL_LB_GET_EXPIRED4
+- PGSQL_LB_GET_EXPIRED6
+- PGSQL_LB_GET_HOSTNAME4
+- PGSQL_LB_GET_HOSTNAME6
+- PGSQL_LB_GET_HWADDR
+- PGSQL_LB_GET_IAID_DUID
+- PGSQL_LB_GET_IAID_SUBID_DUID
+- PGSQL_LB_GET_PAGE4
+- PGSQL_LB_GET_PAGE6
+- PGSQL_LB_GET_RELAYID4
+- PGSQL_LB_GET_RELAYID6
+- PGSQL_LB_GET_REMOTEID4
+- PGSQL_LB_GET_REMOTEID6
+- PGSQL_LB_GET_SUBID4
+- PGSQL_LB_GET_SUBID6
+- PGSQL_LB_GET_SUBID_CLIENTID
+- PGSQL_LB_GET_SUBID_HWADDR
+- PGSQL_LB_GET_SUBID_PAGE6
+- PGSQL_LB_GET_VERSION
+- PGSQL_LB_ROLLBACK
+- PGSQL_LB_UPDATE_ADDR4
+- PGSQL_LB_UPDATE_ADDR6
+- PGSQL_LB_UPGRADE_EXTENDED_INFO4_PAGE
+- PGSQL_LB_UPGRADE_EXTENDED_INFO6_PAGE
 - PING_CHECK_CHANNEL_ECHO_REPLY_RECEIVED
 - PING_CHECK_CHANNEL_ECHO_REQUEST_SENT
 - PING_CHECK_MGR_NEXT_ECHO_SCHEDULED
@@ -1147,6 +1147,7 @@ Messages printed on debuglevel 55
 - DHCP6_SUBNET_DATA
 - DHCPSRV_DDNS_TTL_PERCENT_TOO_SMALL
 - DHCPSRV_MEMFILE_LEASE_LOAD
+- DHCPSRV_QUEUE_NCR
 - DHCP_DDNS_AT_MAX_TRANSACTIONS
 - DHCP_DDNS_FWD_REQUEST_IGNORED
 - DHCP_DDNS_NO_ELIGIBLE_JOBS
@@ -1207,6 +1208,7 @@ Messages printed on debuglevel 55
 - HOOKS_CALLOUT_DEREGISTERED
 - HOSTS_CFG_GET_ALL_ADDRESS4_HOST
 - HOSTS_CFG_GET_ALL_ADDRESS6_HOST
+- HOSTS_CFG_GET_ALL_HOST
 - HOSTS_CFG_GET_ALL_HOSTNAME_HOST
 - HOSTS_CFG_GET_ALL_HOSTNAME_SUBNET_ID4_HOST
 - HOSTS_CFG_GET_ALL_HOSTNAME_SUBNET_ID6_HOST

diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.mes b/src/lib/dhcpsrv/dhcpsrv_messages.mes
index 4171205f36ecdf41127301377c6fdcc047965779..b9a6ac063315e4c684c8ba11111d696bd817ec1a 100644 (file)
--- a/src/lib/dhcpsrv/dhcpsrv_messages.mes
+++ b/src/lib/dhcpsrv/dhcpsrv_messages.mes
@@ -813,7 +813,7 @@ 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_QUEUE_NCR %1: Name change request to %2 DNS entry queued: %3
-Logged at debug log level 50.
+Logged at debug log level 55.
 A debug message which is logged when the NameChangeRequest to add or remove
 a DNS entries for a particular lease has been queued. The first argument
 includes the client identification information. The second argument

diff --git a/src/lib/dhcpsrv/hosts_messages.mes b/src/lib/dhcpsrv/hosts_messages.mes
index f85341a57d355b42c3e20670b8d5a522ffb98257..1ee349e647194c42e867cab8f604f0f5190d277e 100644 (file)
--- a/src/lib/dhcpsrv/hosts_messages.mes
+++ b/src/lib/dhcpsrv/hosts_messages.mes
@@ -73,11 +73,11 @@ have been deleted. The second argument specifies how many IPv6
 the subnet identifier.
 
 % HOSTS_CFG_GET_ALL get all hosts with reservations
-Logged at debug log level 45.
+Logged at debug log level 40.
 This debug message is issued when starting to retrieve all hosts.
 
 % HOSTS_CFG_GET_ALL_ADDRESS4 get all hosts with reservations for IPv4 address %1
-Logged at debug log level 45.
+Logged at debug log level 40.
 This debug message is issued when starting to retrieve all hosts, holding the
 reservation for the specific IPv4 address, from the configuration. The
 argument specifies the IPv4 address used to search the hosts.
@@ -95,7 +95,7 @@ for the specified IPv4 address. The arguments specify the IPv4 address
 and the detailed description of the host found.
 
 % HOSTS_CFG_GET_ALL_ADDRESS6 get all hosts with reservations for IPv6 address %1
-Logged at debug log level 45.
+Logged at debug log level 40.
 This debug message is issued when starting to retrieve all hosts, holding the
 reservation for the specific IPv6 address, from the configuration.
 The argument specifies the IPv6 address used to search the hosts.
@@ -118,12 +118,12 @@ This debug message include the details of the host found. The argument
 specifies the number of hosts found.
 
 % HOSTS_CFG_GET_ALL_HOST found host: %1
-Logged at debug log level 45.
+Logged at debug log level 55.
 This debug message includes the details of the host found. The argument
 specifies found host details.
 
 % HOSTS_CFG_GET_ALL_HOSTNAME get all hosts with reservations for hostname %1
-Logged at debug log level 45.
+Logged at debug log level 40.
 This debug message is issued when starting to retrieve all hosts with
 the specific hostname. The argument specifies hostname.
 
@@ -139,7 +139,7 @@ This debug message includes the details of the host found using the hostname.
 The arguments specify hostname and found host details respectively.
 
 % HOSTS_CFG_GET_ALL_HOSTNAME_SUBNET_ID4 get all hosts with reservations for hostname %1 and IPv4 subnet %2
-Logged at debug log level 45.
+Logged at debug log level 40.
 This debug message is issued when starting to retrieve all hosts with
 the specific hostname connected to the specific DHCPv4 subnet. The argument
 specifies hostname and subnet id.
@@ -157,7 +157,7 @@ hostname and the DHCPv4 subnet id. The arguments specify hostname,
 subnet id and found host details respectively.
 
 % HOSTS_CFG_GET_ALL_HOSTNAME_SUBNET_ID6 get all hosts with reservations for hostname %1 and IPv6 subnet %2
-Logged at debug log level 45.
+Logged at debug log level 40.
 This debug message is issued when starting to retrieve all hosts with
 the specific hostname connected to the specific DHCPv6 subnet. The argument
 specifies hostname and subnet id.
@@ -175,7 +175,7 @@ hostname and the DHCPv6 subnet id. The arguments specify hostname,
 subnet id and found host details respectively.
 
 % HOSTS_CFG_GET_ALL_IDENTIFIER get all hosts with reservations using identifier: %1
-Logged at debug log level 45.
+Logged at debug log level 40.
 This debug message is issued when starting to retrieve reservations for all hosts
 identified by HW address or DUID. The argument holds both the identifier
 type and the value.
@@ -193,7 +193,7 @@ identifier. The arguments specify the identifier and the detailed
 description of the host found.
 
 % HOSTS_CFG_GET_ALL_SUBNET_ID4 get all hosts with reservations for IPv4 subnet %1
-Logged at debug log level 45.
+Logged at debug log level 40.
 This debug message is issued when starting to retrieve all hosts connected to
 the specific DHCPv4 subnet. The argument specifies subnet id.
 
@@ -209,7 +209,7 @@ This debug message includes the details of the host found using the DHCPv4
 subnet id. The arguments specify subnet id and found host details respectively.
 
 % HOSTS_CFG_GET_ALL_SUBNET_ID6 get all hosts with reservations for IPv6 subnet %1
-Logged at debug log level 45.
+Logged at debug log level 40.
 This debug message is issued when starting to retrieve all hosts connected to
 the specific DHCPv6 subnet. The argument specifies subnet id.
 
@@ -225,7 +225,7 @@ This debug message includes the details of the host found using the DHCPv6
 subnet id. The arguments specify subnet id and found host details respectively.
 
 % HOSTS_CFG_GET_ALL_SUBNET_ID_ADDRESS4 get all hosts with reservations for subnet id %1 and IPv4 address %2
-Logged at debug log level 45.
+Logged at debug log level 40.
 This debug message is issued when starting to retrieve all hosts having
 the reservation for the given IPv4 address within the given subnet. The
 first argument specifies subnet identifier. The second argument specifies
@@ -247,7 +247,7 @@ specifies the subnet identifier. The second argument specifies the reserved
 IPv4 address. The third argument specifies host details.
 
 % HOSTS_CFG_GET_ALL_SUBNET_ID_ADDRESS6 get all hosts with reservations for subnet id %1 and IPv6 address %2
-Logged at debug log level 45.
+Logged at debug log level 40.
 This debug message is issued when starting to retrieve all hosts connected to
 the specific subnet and having the specific IPv6 address reserved.
 The arguments specify subnet id and IPv6 address respectively.
@@ -283,7 +283,7 @@ This debug message is issued when no host was found for a specified
 prefix and prefix length.
 
 % HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS4 get one host with reservation for subnet id %1 and IPv4 address %2
-Logged at debug log level 45.
+Logged at debug log level 40.
 This debug message is issued when starting to retrieve a host connected to the
 specific subnet and having the specific IPv4 address reserved. The
 arguments specify subnet id and IPv4 address respectively.
@@ -299,7 +299,7 @@ This debug message is issued when no host was found for the specified
 subnet id and IPv4 address.
 
 % HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS6 get one host with reservation for subnet id %1 and having IPv6 address %2
-Logged at debug log level 45.
+Logged at debug log level 40.
 This debug message is issued when starting to retrieve a host connected to the
 specific subnet and having the specific IPv6 address reserved. The
 arguments specify subnet id and IPv6 address respectively.
@@ -315,7 +315,7 @@ This debug message is issued when no host was found using the specified
 subnet if and IPv6 address.
 
 % HOSTS_CFG_GET_ONE_SUBNET_ID_IDENTIFIER get one host with %1 reservation for subnet id %2, identified by %3
-Logged at debug log level 45.
+Logged at debug log level 40.
 This debug message is issued when starting to retrieve a host holding
 IPv4 or IPv6 reservations, which is connected to a specific subnet and
 is identified by a specific unique identifier. The first argument
@@ -362,7 +362,7 @@ the specific IPv4 address, and it is starting to search for this host
 in alternate host data sources.
 
 % HOSTS_MGR_ALTERNATE_GET4_SUBNET_ID_IDENTIFIER get one host with IPv4 reservation for subnet id %1, identified by %2
-Logged at debug log level 45.
+Logged at debug log level 40.
 This debug message is issued when starting to retrieve a host holding
 IPv4 reservation, which is connected to a specific subnet and
 is identified by a specific unique identifier.
@@ -393,7 +393,7 @@ the specified IPv6 address, and it is starting to search for this
 host in alternate host data sources.
 
 % HOSTS_MGR_ALTERNATE_GET6_SUBNET_ID_IDENTIFIER get one host with IPv6 reservation for subnet id %1, identified by %2
-Logged at debug log level 45.
+Logged at debug log level 40.
 This debug message is issued when starting to retrieve a host holding
 IPv4 reservation, which is connected to a specific subnet and
 is identified by a specific unique identifier.

diff --git a/tools/check-messages.py b/tools/check-messages.py
index 1e75f338c7e281a0d49d1b1275ffcd97b2a5c5e7..c98ed36fff1a578ff759887330c427d05a5cd2e2 100755 (executable)
--- a/tools/check-messages.py
+++ b/tools/check-messages.py
@@ -99,7 +99,7 @@ def check_that_debug_log_levels_are_documented(messages, debug_levels, log_lines
     for message_id, message in messages.items():
         log_level = None
         for line in log_lines:
-            if line.startswith('LOG_DEBUG') and message_id in line:
+            if line.startswith('LOG_DEBUG') and re.search(fr'LOG_DEBUG\(.*\b{message_id}\b', line):
                 log_level = line.split(',')[1].strip().replace('isc::log::', '').replace('log::', '')
                 break
         if log_level is None:

diff --git a/tools/exhonerated-duplicate-messages.txt b/tools/exhonerated-duplicate-messages.txt
index e5d40b7c71fee295db0bb808a3c0080d277f2ef0..a17a63dfd14cc5f5991f9e567ee9fb23020e05f0 100644 (file)
--- a/tools/exhonerated-duplicate-messages.txt
+++ b/tools/exhonerated-duplicate-messages.txt
@@ -14,10 +14,6 @@
     % DHCP6_CONFIG_RECEIVED: 2
     % DHCPSRV_HOOK_LEASE4_SELECT_SKIP: 2
     % DHCPSRV_HOOK_LEASE6_SELECT_SKIP: 2
-    % DHCPSRV_MYSQL_TLS_CIPHER: 2
-    % DHCPSRV_MYSQL_DELETE_ADDR: 2
-    % DHCPSRV_PGSQL_DELETE_ADDR: 2
-    % DHCPSRV_MEMFILE_DELETE_ADDR: 2
     % EVAL_DEBUG_OPTION: 2
     % msgid: 2
     % FLEX_OPTION_PROCESS_ADD: 2
@@ -92,8 +88,6 @@
     % DHCP_DDNS_UNCAUGHT_NCR_RECV_HANDLER_ERROR: 2
     % DHCP_DDNS_UNCAUGHT_NCR_SEND_HANDLER_ERROR: 2
     % DHCP_DDNS_NCR_FLUSH_IO_ERROR: 2
-    % DHCPSRV_MYSQL_NO_TLS: 2
-    % DHCPSRV_PGSQL_NO_TLS_SUPPORT: 2
     % DHCPSRV_UNKNOWN_DB: 3
     % FLEX_OPTION_PROCESS_ERROR: 2
     % HA_PAUSE_CLIENT_LISTENER_FAILED: 2
@@ -124,7 +118,6 @@
     % DHCP6_CONFIG_PACKET_QUEUE: 2
     % DHCPSRV_LEASE_SANITY_FAIL_DISCARD: 2
     % DHCPSRV_LEASE_SANITY_FIXED: 2
-    % DHCPSRV_PGSQL_TLS_SUPPORT: 2
     % DHCP6_LEASE_REUSE: 2
     % DHCP6_PD_LEASE_REUSE: 2
     % LOG_READ_ERROR: 2