From: Razvan Becheriu Date: Thu, 16 May 2019 10:16:13 +0000 (+0300) Subject: updated logs X-Git-Tag: Kea-1.6.0-beta~127 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43702242b9a7a2d03aaaf79d1724ef22da925cea;p=thirdparty%2Fkea.git updated logs --- diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc index fafed09346..f7f69b0d77 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc @@ -2563,10 +2563,12 @@ MySqlConfigBackendDHCPv4::deleteSubnet4(const ServerSelector& server_selector, const std::string& subnet_prefix) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_PREFIX_SUBNET4) .arg(subnet_prefix); - return(impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_SUBNET4_PREFIX, - server_selector, "deleting a subnet by prefix", - "subnet deleted", true, - subnet_prefix)); + uint64_t result = impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_SUBNET4_PREFIX, + server_selector, "deleting a subnet by prefix", + "subnet deleted", true, subnet_prefix); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_PREFIX_SUBNET4_RESULT) + .arg(result); + return (result); } uint64_t @@ -2574,15 +2576,21 @@ MySqlConfigBackendDHCPv4::deleteSubnet4(const ServerSelector& server_selector, const SubnetID& subnet_id) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4) .arg(subnet_id); - return (impl_->deleteSubnet4(server_selector, subnet_id)); + uint64_t result = impl_->deleteSubnet4(server_selector, subnet_id); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4_RESULT) + .arg(result); + return (result); } uint64_t MySqlConfigBackendDHCPv4::deleteAllSubnets4(const ServerSelector& server_selector) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_SUBNETS4); - return (impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_ALL_SUBNETS4, - server_selector, "deleting all subnets", - "deleted all subnets", true)); + uint64_t result = impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_ALL_SUBNETS4, + server_selector, "deleting all subnets", + "deleted all subnets", true); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_SUBNETS4_RESULT) + .arg(result); + return (result); } uint64_t @@ -2590,11 +2598,14 @@ MySqlConfigBackendDHCPv4::deleteSharedNetworkSubnets4(const db::ServerSelector& const std::string& shared_network_name) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4) .arg(shared_network_name); - return (impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_ALL_SUBNETS4_SHARED_NETWORK_NAME, - server_selector, - "deleting all subnets for a shared network", - "deleted all subnets for a shared network", - true, shared_network_name)); + uint64_t result = impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_ALL_SUBNETS4_SHARED_NETWORK_NAME, + server_selector, + "deleting all subnets for a shared network", + "deleted all subnets for a shared network", + true, shared_network_name); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4_RESULT) + .arg(result); + return (result); } uint64_t @@ -2602,18 +2613,23 @@ MySqlConfigBackendDHCPv4::deleteSharedNetwork4(const ServerSelector& server_sele const std::string& name) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK4) .arg(name); - return (impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_SHARED_NETWORK4_NAME, - server_selector, "deleting a shared network", - "shared network deleted", true, - name)); + uint64_t result = impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_SHARED_NETWORK4_NAME, + server_selector, "deleting a shared network", + "shared network deleted", true, name); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK4_RESULT) + .arg(result); + return (result); } uint64_t MySqlConfigBackendDHCPv4::deleteAllSharedNetworks4(const ServerSelector& server_selector) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4); - return (impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_ALL_SHARED_NETWORKS4, - server_selector, "deleting all shared networks", - "deleted all shared networks", true)); + uint64_t result = impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_ALL_SHARED_NETWORKS4, + server_selector, "deleting all shared networks", + "deleted all shared networks", true); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4_RESULT) + .arg(result); + return (result); } uint64_t @@ -2622,15 +2638,21 @@ MySqlConfigBackendDHCPv4::deleteOptionDef4(const ServerSelector& server_selector const std::string& space) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_OPTION_DEF4) .arg(code).arg(space); - return (impl_->deleteOptionDef4(server_selector, code, space)); + uint64_t result = impl_->deleteOptionDef4(server_selector, code, space); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_OPTION_DEF4_RESULT) + .arg(result); + return (result); } uint64_t MySqlConfigBackendDHCPv4::deleteAllOptionDefs4(const ServerSelector& server_selector) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_OPTION_DEFS4); - return (impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_ALL_OPTION_DEFS4, - server_selector, "deleting all option definitions", - "deleted all option definitions", true)); + uint64_t result = impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_ALL_OPTION_DEFS4, + server_selector, "deleting all option definitions", + "deleted all option definitions", true); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_OPTION_DEFS4_RESULT) + .arg(result); + return (result); } uint64_t @@ -2639,7 +2661,10 @@ MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& server_selector, const std::string& space) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_OPTION4) .arg(code).arg(space); - return (impl_->deleteOption4(server_selector, code, space)); + uint64_t result = impl_->deleteOption4(server_selector, code, space); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_OPTION4_RESULT) + .arg(result); + return (result); } uint64_t @@ -2649,8 +2674,11 @@ MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& server_selector, const std::string& space) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4) .arg(shared_network_name).arg(code).arg(space); - return (impl_->deleteOption4(server_selector, shared_network_name, - code, space)); + uint64_t result = impl_->deleteOption4(server_selector, shared_network_name, + code, space); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4_RESULT) + .arg(result); + return (result); } uint64_t @@ -2660,7 +2688,10 @@ MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& server_selector, const std::string& space) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4) .arg(subnet_id).arg(code).arg(space); - return (impl_->deleteOption4(server_selector, subnet_id, code, space)); + uint64_t result = impl_->deleteOption4(server_selector, subnet_id, code, space); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4_RESULT) + .arg(result); + return (result); } uint64_t @@ -2671,8 +2702,11 @@ MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& server_selector, const std::string& space) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_POOL_OPTION4) .arg(pool_start_address.toText()).arg(pool_end_address.toText()).arg(code).arg(space); - return (impl_->deleteOption4(server_selector, pool_start_address, pool_end_address, - code, space)); + uint64_t result = impl_->deleteOption4(server_selector, pool_start_address, pool_end_address, + code, space); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_POOL_OPTION4_RESULT) + .arg(result); + return (result); } uint64_t @@ -2680,18 +2714,23 @@ MySqlConfigBackendDHCPv4::deleteGlobalParameter4(const ServerSelector& server_se const std::string& name) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_GLOBAL_PARAMETER4) .arg(name); - return (impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_GLOBAL_PARAMETER4, - server_selector, "deleting global parameter", - "global parameter deleted", false, - name)); + uint64_t result = impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_GLOBAL_PARAMETER4, + server_selector, "deleting global parameter", + "global parameter deleted", false, name); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_GLOBAL_PARAMETER4_RESULT) + .arg(result); + return (result); } uint64_t MySqlConfigBackendDHCPv4::deleteAllGlobalParameters4(const ServerSelector& server_selector) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4); - return (impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_ALL_GLOBAL_PARAMETERS4, - server_selector, "deleting all global parameters", - "all global parameters deleted", true)); + uint64_t result = impl_->deleteTransactional(MySqlConfigBackendDHCPv4Impl::DELETE_ALL_GLOBAL_PARAMETERS4, + server_selector, "deleting all global parameters", + "all global parameters deleted", true); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4_RESULT) + .arg(result); + return (result); } std::string diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc index 68e182bbb3..a15c0a838e 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc @@ -2861,10 +2861,12 @@ MySqlConfigBackendDHCPv6::deleteSubnet6(const ServerSelector& server_selector, const std::string& subnet_prefix) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_PREFIX_SUBNET6) .arg(subnet_prefix); - return(impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_SUBNET6_PREFIX, - server_selector, "deleting a subnet by prefix", - "subnet deleted", true, - subnet_prefix)); + uint64_t result = impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_SUBNET6_PREFIX, + server_selector, "deleting a subnet by prefix", + "subnet deleted", true, subnet_prefix); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_PREFIX_SUBNET6_RESULT) + .arg(result); + return (result); } uint64_t @@ -2872,15 +2874,21 @@ MySqlConfigBackendDHCPv6::deleteSubnet6(const ServerSelector& server_selector, const SubnetID& subnet_id) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6) .arg(subnet_id); - return (impl_->deleteSubnet6(server_selector, subnet_id)); + uint64_t result = impl_->deleteSubnet6(server_selector, subnet_id); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6_RESULT) + .arg(result); + return (result); } uint64_t MySqlConfigBackendDHCPv6::deleteAllSubnets6(const ServerSelector& server_selector) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_SUBNETS6); - return (impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_ALL_SUBNETS6, - server_selector, "deleting all subnets", - "deleted all subnets", true)); + uint64_t result = impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_ALL_SUBNETS6, + server_selector, "deleting all subnets", + "deleted all subnets", true); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_SUBNETS6_RESULT) + .arg(result); + return (result); } uint64_t @@ -2888,11 +2896,14 @@ MySqlConfigBackendDHCPv6::deleteSharedNetworkSubnets6(const db::ServerSelector& const std::string& shared_network_name) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6) .arg(shared_network_name); - return (impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_ALL_SUBNETS6_SHARED_NETWORK_NAME, - server_selector, - "deleting all subnets for a shared network", - "deleted all subnets for a shared network", - true, shared_network_name)); + uint64_t result = impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_ALL_SUBNETS6_SHARED_NETWORK_NAME, + server_selector, + "deleting all subnets for a shared network", + "deleted all subnets for a shared network", + true, shared_network_name); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6_RESULT) + .arg(result); + return (result); } uint64_t @@ -2900,18 +2911,23 @@ MySqlConfigBackendDHCPv6::deleteSharedNetwork6(const ServerSelector& server_sele const std::string& name) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK6) .arg(name); - return (impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_SHARED_NETWORK6_NAME, - server_selector, "deleting a shared network", - "shared network deleted", true, - name)); + uint64_t result = impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_SHARED_NETWORK6_NAME, + server_selector, "deleting a shared network", + "shared network deleted", true, name); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK6_RESULT) + .arg(result); + return (result); } uint64_t MySqlConfigBackendDHCPv6::deleteAllSharedNetworks6(const ServerSelector& server_selector) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6); - return (impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_ALL_SHARED_NETWORKS6, - server_selector, "deleting all shared networks", - "deleted all shared networks", true)); + uint64_t result = impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_ALL_SHARED_NETWORKS6, + server_selector, "deleting all shared networks", + "deleted all shared networks", true); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6_RESULT) + .arg(result); + return (result); } uint64_t @@ -2920,15 +2936,21 @@ MySqlConfigBackendDHCPv6::deleteOptionDef6(const ServerSelector& server_selector const std::string& space) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_OPTION_DEF6) .arg(code).arg(space); - return (impl_->deleteOptionDef6(server_selector, code, space)); + uint64_t result = impl_->deleteOptionDef6(server_selector, code, space); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_OPTION_DEF6_RESULT) + .arg(result); + return (result); } uint64_t MySqlConfigBackendDHCPv6::deleteAllOptionDefs6(const ServerSelector& server_selector) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_OPTION_DEFS6); - return (impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_ALL_OPTION_DEFS6, - server_selector, "deleting all option definitions", - "deleted all option definitions", true)); + uint64_t result = impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_ALL_OPTION_DEFS6, + server_selector, "deleting all option definitions", + "deleted all option definitions", true); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_OPTION_DEFS6_RESULT) + .arg(result); + return (result); } uint64_t @@ -2937,7 +2959,10 @@ MySqlConfigBackendDHCPv6::deleteOption6(const ServerSelector& server_selector, const std::string& space) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_OPTION6) .arg(code).arg(space); - return (impl_->deleteOption6(server_selector, code, space)); + uint64_t result = impl_->deleteOption6(server_selector, code, space); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_OPTION6_RESULT) + .arg(result); + return (result); } uint64_t @@ -2947,8 +2972,11 @@ MySqlConfigBackendDHCPv6::deleteOption6(const ServerSelector& server_selector, const std::string& space) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6) .arg(shared_network_name).arg(code).arg(space); - return (impl_->deleteOption6(server_selector, shared_network_name, - code, space)); + uint64_t result = impl_->deleteOption6(server_selector, shared_network_name, + code, space); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6_RESULT) + .arg(result); + return (result); } uint64_t @@ -2958,7 +2986,10 @@ MySqlConfigBackendDHCPv6::deleteOption6(const ServerSelector& server_selector, const std::string& space) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6) .arg(subnet_id).arg(code).arg(space); - return (impl_->deleteOption6(server_selector, subnet_id, code, space)); + uint64_t result = impl_->deleteOption6(server_selector, subnet_id, code, space); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6_RESULT) + .arg(result); + return (result); } uint64_t @@ -2969,8 +3000,11 @@ MySqlConfigBackendDHCPv6::deleteOption6(const ServerSelector& server_selector, const std::string& space) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_POOL_OPTION6) .arg(pool_start_address.toText()).arg(pool_end_address.toText()).arg(code).arg(space); - return (impl_->deleteOption6(server_selector, pool_start_address, pool_end_address, - code, space)); + uint64_t result = impl_->deleteOption6(server_selector, pool_start_address, pool_end_address, + code, space); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_POOL_OPTION6_RESULT) + .arg(result); + return (result); } uint64_t @@ -2981,8 +3015,11 @@ MySqlConfigBackendDHCPv6::deleteOption6(const ServerSelector& server_selector, const std::string& space) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6) .arg(pd_pool_prefix.toText()).arg(pd_pool_prefix_length).arg(code).arg(space); - return (impl_->deleteOption6(server_selector, pd_pool_prefix, - pd_pool_prefix_length, code, space)); + uint64_t result = impl_->deleteOption6(server_selector, pd_pool_prefix, + pd_pool_prefix_length, code, space); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6_RESULT) + .arg(result); + return (result); } uint64_t @@ -2990,18 +3027,23 @@ MySqlConfigBackendDHCPv6::deleteGlobalParameter6(const ServerSelector& server_se const std::string& name) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_GLOBAL_PARAMETER6) .arg(name); - return (impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_GLOBAL_PARAMETER6, - server_selector, "deleting global parameter", - "global parameter deleted", false, - name)); + uint64_t result = impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_GLOBAL_PARAMETER6, + server_selector, "deleting global parameter", + "global parameter deleted", false, name); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_GLOBAL_PARAMETER6_RESULT) + .arg(result); + return (result); } uint64_t MySqlConfigBackendDHCPv6::deleteAllGlobalParameters6(const ServerSelector& server_selector) { LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6); - return (impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_ALL_GLOBAL_PARAMETERS6, - server_selector, "deleting all global parameters", - "all global parameters deleted", true)); + uint64_t result = impl_->deleteTransactional(MySqlConfigBackendDHCPv6Impl::DELETE_ALL_GLOBAL_PARAMETERS6, + server_selector, "deleting all global parameters", + "all global parameters deleted", true); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6_RESULT) + .arg(result); + return (result); } std::string diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.cc index c6e2592d5f..3fdb22ed74 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.cc @@ -1,4 +1,4 @@ -// File created from ../../../../src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes on Thu May 16 2019 09:34 +// File created from ../../../../src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes on Thu May 16 2019 12:22 #include #include @@ -26,34 +26,63 @@ extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SUBNET4 = "MYSQL_CB_CREA extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SUBNET6 = "MYSQL_CB_CREATE_UPDATE_SUBNET6"; extern const isc::log::MessageID MYSQL_CB_DEINIT_OK = "MYSQL_CB_DEINIT_OK"; extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4 = "MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4_RESULT = "MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6 = "MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6_RESULT = "MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_OPTION_DEFS4 = "MYSQL_CB_DELETE_ALL_OPTION_DEFS4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_OPTION_DEFS4_RESULT = "MYSQL_CB_DELETE_ALL_OPTION_DEFS4_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_OPTION_DEFS6 = "MYSQL_CB_DELETE_ALL_OPTION_DEFS6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_OPTION_DEFS6_RESULT = "MYSQL_CB_DELETE_ALL_OPTION_DEFS6_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4 = "MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4_RESULT = "MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6 = "MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6_RESULT = "MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SUBNETS4 = "MYSQL_CB_DELETE_ALL_SUBNETS4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SUBNETS4_RESULT = "MYSQL_CB_DELETE_ALL_SUBNETS4_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SUBNETS6 = "MYSQL_CB_DELETE_ALL_SUBNETS6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SUBNETS6_RESULT = "MYSQL_CB_DELETE_ALL_SUBNETS6_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_BY_POOL_OPTION4 = "MYSQL_CB_DELETE_BY_POOL_OPTION4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_POOL_OPTION4_RESULT = "MYSQL_CB_DELETE_BY_POOL_OPTION4_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_BY_POOL_OPTION6 = "MYSQL_CB_DELETE_BY_POOL_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_POOL_OPTION6_RESULT = "MYSQL_CB_DELETE_BY_POOL_OPTION6_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6 = "MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6_RESULT = "MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_BY_PREFIX_SUBNET4 = "MYSQL_CB_DELETE_BY_PREFIX_SUBNET4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_PREFIX_SUBNET4_RESULT = "MYSQL_CB_DELETE_BY_PREFIX_SUBNET4_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_BY_PREFIX_SUBNET6 = "MYSQL_CB_DELETE_BY_PREFIX_SUBNET6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_PREFIX_SUBNET6_RESULT = "MYSQL_CB_DELETE_BY_PREFIX_SUBNET6_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4 = "MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4_RESULT = "MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6 = "MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6_RESULT = "MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4 = "MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4_RESULT = "MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6 = "MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6_RESULT = "MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_GLOBAL_PARAMETER4 = "MYSQL_CB_DELETE_GLOBAL_PARAMETER4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_GLOBAL_PARAMETER4_RESULT = "MYSQL_CB_DELETE_GLOBAL_PARAMETER4_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_GLOBAL_PARAMETER6 = "MYSQL_CB_DELETE_GLOBAL_PARAMETER6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_GLOBAL_PARAMETER6_RESULT = "MYSQL_CB_DELETE_GLOBAL_PARAMETER6_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION4 = "MYSQL_CB_DELETE_OPTION4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION4_RESULT = "MYSQL_CB_DELETE_OPTION4_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION6 = "MYSQL_CB_DELETE_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION6_RESULT = "MYSQL_CB_DELETE_OPTION6_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION_DEF4 = "MYSQL_CB_DELETE_OPTION_DEF4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION_DEF4_RESULT = "MYSQL_CB_DELETE_OPTION_DEF4_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION_DEF6 = "MYSQL_CB_DELETE_OPTION_DEF6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION_DEF6_RESULT = "MYSQL_CB_DELETE_OPTION_DEF6_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK4 = "MYSQL_CB_DELETE_SHARED_NETWORK4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK4_RESULT = "MYSQL_CB_DELETE_SHARED_NETWORK4_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK6 = "MYSQL_CB_DELETE_SHARED_NETWORK6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK6_RESULT = "MYSQL_CB_DELETE_SHARED_NETWORK6_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4 = "MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4_RESULT = "MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6 = "MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6_RESULT = "MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4 = "MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4"; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4_RESULT = "MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4_RESULT"; extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6 = "MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6"; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6_RESULT = "MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6_RESULT"; extern const isc::log::MessageID MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4 = "MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4"; extern const isc::log::MessageID MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4_RESULT = "MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4_RESULT"; extern const isc::log::MessageID MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6 = "MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6"; @@ -151,34 +180,63 @@ const char* values[] = { "MYSQL_CB_CREATE_UPDATE_SUBNET6", "create or update MySQL CB subnet: %1", "MYSQL_CB_DEINIT_OK", "unloading MYSQAL CB hooks library successful", "MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4", "delete MySQL CB all global parameters", + "MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6", "delete MySQL CB all global parameters", + "MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_ALL_OPTION_DEFS4", "delete MySQL CB all option definitions", + "MYSQL_CB_DELETE_ALL_OPTION_DEFS4_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_ALL_OPTION_DEFS6", "delete MySQL CB all option definitions", + "MYSQL_CB_DELETE_ALL_OPTION_DEFS6_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4", "delete MySQL CB all shared networks", + "MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6", "delete MySQL CB all shared networks", + "MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_ALL_SUBNETS4", "delete MySQL CB all subnets", + "MYSQL_CB_DELETE_ALL_SUBNETS4_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_ALL_SUBNETS6", "delete MySQL CB all subnets", + "MYSQL_CB_DELETE_ALL_SUBNETS6_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_BY_POOL_OPTION4", "delete MySQL CB pool start: %1 pool end: %2 option code: %3 space: %4", + "MYSQL_CB_DELETE_BY_POOL_OPTION4_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_BY_POOL_OPTION6", "delete MySQL CB pool start: %1 pool end: %2 option code: %3 space: %4", + "MYSQL_CB_DELETE_BY_POOL_OPTION6_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6", "delete MySQL CB prefix: %1 prefix len: %2 option code: %3 space: %4", + "MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_BY_PREFIX_SUBNET4", "delete MySQL CB subnet by prefix: %1", + "MYSQL_CB_DELETE_BY_PREFIX_SUBNET4_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_BY_PREFIX_SUBNET6", "delete MySQL CB subnet by prefix: %1", + "MYSQL_CB_DELETE_BY_PREFIX_SUBNET6_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4", "delete MySQL CB by subnet id: %1 option code: %2 space: %3", + "MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6", "delete MySQL CB by subnet id: %1 option code: %2 space: %3", + "MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4", "delete MySQL CB subnet by subnet id: %1", + "MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6", "delete MySQL CB subnet by subnet id: %1", + "MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_GLOBAL_PARAMETER4", "delete MySQL CB global parameter: %1", + "MYSQL_CB_DELETE_GLOBAL_PARAMETER4_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_GLOBAL_PARAMETER6", "delete MySQL CB global parameter: %1", + "MYSQL_CB_DELETE_GLOBAL_PARAMETER6_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_OPTION4", "delete MySQL CB option code: %1 space: %2", + "MYSQL_CB_DELETE_OPTION4_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_OPTION6", "delete MySQL CB option code: %1 space: %2", + "MYSQL_CB_DELETE_OPTION6_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_OPTION_DEF4", "delete MySQL CB option definition code: %1 space: %2", + "MYSQL_CB_DELETE_OPTION_DEF4_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_OPTION_DEF6", "delete MySQL CB option definition code: %1 space: %2", + "MYSQL_CB_DELETE_OPTION_DEF6_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_SHARED_NETWORK4", "delete MySQL CB shared network: %1", + "MYSQL_CB_DELETE_SHARED_NETWORK4_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_SHARED_NETWORK6", "delete MySQL CB shared network: %1", + "MYSQL_CB_DELETE_SHARED_NETWORK6_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4", "delete MySQL CB shared network: %1 option code: %2 space: %3", + "MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6", "delete MySQL CB shared network: %1 option code: %2 space: %3", + "MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4", "delete MySQL CB shared network: %1 subnets", + "MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4_RESULT", "deleted: %1 entries", "MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6", "delete MySQL CB shared network: %1 subnets", + "MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6_RESULT", "deleted: %1 entries", "MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4", "retrieving MySQL CB all global parameters", "MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4_RESULT", "retrieving: %1 elements", "MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6", "retrieving MySQL CB all global parameters", diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.h b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.h index 442788610f..ae2c85bbd1 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.h +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.h @@ -1,4 +1,4 @@ -// File created from ../../../../src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes on Thu May 16 2019 09:34 +// File created from ../../../../src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes on Thu May 16 2019 12:22 #ifndef MYSQL_CB_MESSAGES_H #define MYSQL_CB_MESSAGES_H @@ -27,34 +27,63 @@ extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SUBNET4; extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SUBNET6; extern const isc::log::MessageID MYSQL_CB_DEINIT_OK; extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_OPTION_DEFS4; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_OPTION_DEFS4_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_OPTION_DEFS6; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_OPTION_DEFS6_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SUBNETS4; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SUBNETS4_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SUBNETS6; +extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SUBNETS6_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_BY_POOL_OPTION4; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_POOL_OPTION4_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_BY_POOL_OPTION6; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_POOL_OPTION6_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_BY_PREFIX_SUBNET4; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_PREFIX_SUBNET4_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_BY_PREFIX_SUBNET6; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_PREFIX_SUBNET6_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6; +extern const isc::log::MessageID MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_GLOBAL_PARAMETER4; +extern const isc::log::MessageID MYSQL_CB_DELETE_GLOBAL_PARAMETER4_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_GLOBAL_PARAMETER6; +extern const isc::log::MessageID MYSQL_CB_DELETE_GLOBAL_PARAMETER6_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION4; +extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION4_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION6; +extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION6_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION_DEF4; +extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION_DEF4_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION_DEF6; +extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION_DEF6_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK4; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK4_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK6; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK6_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4_RESULT; extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6; +extern const isc::log::MessageID MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6_RESULT; extern const isc::log::MessageID MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4; extern const isc::log::MessageID MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4_RESULT; extern const isc::log::MessageID MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6; diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes index f08c1b98fd..c2738122bd 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes @@ -127,45 +127,87 @@ Debug message issued when triggered an action to create or update MySQL CB globa % MYSQL_CB_DELETE_BY_PREFIX_SUBNET4 delete MySQL CB subnet by prefix: %1 Debug message issued when triggered an action to delete MySQL CB subnet by prefix +% MYSQL_CB_DELETE_BY_PREFIX_SUBNET4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB subnet by prefix + % MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4 delete MySQL CB subnet by subnet id: %1 Debug message issued when triggered an action to delete MySQL CB subnet by subnet id +% MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB subnet by subnet id + % MYSQL_CB_DELETE_ALL_SUBNETS4 delete MySQL CB all subnets Debug message issued when triggered an action to delete MySQL CB all subnets +% MYSQL_CB_DELETE_ALL_SUBNETS4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB all subnets + % MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4 delete MySQL CB shared network: %1 subnets Debug message issued when triggered an action to delete MySQL CB shared network subnets +% MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB shared network subnets + % MYSQL_CB_DELETE_SHARED_NETWORK4 delete MySQL CB shared network: %1 Debug message issued when triggered an action to delete MySQL CB shared network +% MYSQL_CB_DELETE_SHARED_NETWORK4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB shared network + % MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4 delete MySQL CB all shared networks Debug message issued when triggered an action to delete MySQL CB all shared networks +% MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB all shared networks + % MYSQL_CB_DELETE_OPTION_DEF4 delete MySQL CB option definition code: %1 space: %2 Debug message issued when triggered an action to delete MySQL CB option definition +% MYSQL_CB_DELETE_OPTION_DEF4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB option definition + % MYSQL_CB_DELETE_ALL_OPTION_DEFS4 delete MySQL CB all option definitions Debug message issued when triggered an action to delete MySQL CB all option definitions +% MYSQL_CB_DELETE_ALL_OPTION_DEFS4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB all option definitions + % MYSQL_CB_DELETE_OPTION4 delete MySQL CB option code: %1 space: %2 Debug message issued when triggered an action to delete MySQL CB option +% MYSQL_CB_DELETE_OPTION4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB option + % MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4 delete MySQL CB shared network: %1 option code: %2 space: %3 Debug message issued when triggered an action to delete MySQL CB shared network option +% MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB shared network option + % MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4 delete MySQL CB by subnet id: %1 option code: %2 space: %3 Debug message issued when triggered an action to delete MySQL CB option by subnet id +% MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB option by subnet id + % MYSQL_CB_DELETE_BY_POOL_OPTION4 delete MySQL CB pool start: %1 pool end: %2 option code: %3 space: %4 Debug message issued when triggered an action to delete MySQL CB option by pool +% MYSQL_CB_DELETE_BY_POOL_OPTION4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB option by pool + % MYSQL_CB_DELETE_GLOBAL_PARAMETER4 delete MySQL CB global parameter: %1 Debug message issued when triggered an action to delete MySQL CB global parameter +% MYSQL_CB_DELETE_GLOBAL_PARAMETER4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB global parameter + % MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4 delete MySQL CB all global parameters Debug message issued when triggered an action to delete MySQL CB all global parameters +% MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB all global parameters + % MYSQL_CB_GET_TYPE4 get MySQL CB type Debug message issued when triggered an action to retrieve MySQL CB type @@ -301,48 +343,93 @@ Debug message issued when triggered an action to create or update MySQL CB globa % MYSQL_CB_DELETE_BY_PREFIX_SUBNET6 delete MySQL CB subnet by prefix: %1 Debug message issued when triggered an action to delete MySQL CB subnet by prefix +% MYSQL_CB_DELETE_BY_PREFIX_SUBNET6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB subnet by prefix + % MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6 delete MySQL CB subnet by subnet id: %1 Debug message issued when triggered an action to delete MySQL CB subnet by subnet id +% MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB subnet by subnet id + % MYSQL_CB_DELETE_ALL_SUBNETS6 delete MySQL CB all subnets Debug message issued when triggered an action to delete MySQL CB all subnets +% MYSQL_CB_DELETE_ALL_SUBNETS6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB all subnets + % MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6 delete MySQL CB shared network: %1 subnets Debug message issued when triggered an action to delete MySQL CB shared network subnets +% MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB shared network subnets + % MYSQL_CB_DELETE_SHARED_NETWORK6 delete MySQL CB shared network: %1 Debug message issued when triggered an action to delete MySQL CB shared network +% MYSQL_CB_DELETE_SHARED_NETWORK6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB shared network + % MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6 delete MySQL CB all shared networks Debug message issued when triggered an action to delete MySQL CB all shared networks +% MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB all shared networks + % MYSQL_CB_DELETE_OPTION_DEF6 delete MySQL CB option definition code: %1 space: %2 Debug message issued when triggered an action to delete MySQL CB option definition +% MYSQL_CB_DELETE_OPTION_DEF6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB option definition + % MYSQL_CB_DELETE_ALL_OPTION_DEFS6 delete MySQL CB all option definitions Debug message issued when triggered an action to delete MySQL CB all option definitions +% MYSQL_CB_DELETE_ALL_OPTION_DEFS6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB all option definitions + % MYSQL_CB_DELETE_OPTION6 delete MySQL CB option code: %1 space: %2 Debug message issued when triggered an action to delete MySQL CB option +% MYSQL_CB_DELETE_OPTION6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB option + % MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6 delete MySQL CB shared network: %1 option code: %2 space: %3 Debug message issued when triggered an action to delete MySQL CB shared network option +% MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB shared network option + % MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6 delete MySQL CB by subnet id: %1 option code: %2 space: %3 Debug message issued when triggered an action to delete MySQL CB option by subnet id +% MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB option by subnet id + % MYSQL_CB_DELETE_BY_POOL_OPTION6 delete MySQL CB pool start: %1 pool end: %2 option code: %3 space: %4 Debug message issued when triggered an action to delete MySQL CB option by pool +% MYSQL_CB_DELETE_BY_POOL_OPTION6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB option by pool + % MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6 delete MySQL CB prefix: %1 prefix len: %2 option code: %3 space: %4 Debug message issued when triggered an action to delete MySQL CB option by prefix +% MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB option by prefix + % MYSQL_CB_DELETE_GLOBAL_PARAMETER6 delete MySQL CB global parameter: %1 Debug message issued when triggered an action to delete MySQL CB global parameter +% MYSQL_CB_DELETE_GLOBAL_PARAMETER6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB global parameter + % MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6 delete MySQL CB all global parameters Debug message issued when triggered an action to delete MySQL CB all global parameters +% MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete MySQL CB all global parameters + % MYSQL_CB_GET_TYPE6 get MySQL CB type Debug message issued when triggered an action to retrieve MySQL CB type