diff --git a/doc/guide/logging.xml b/doc/guide/logging.xml index 4a5625508c8a3a7e388af696533d65eccf2c838c..d5edef211610638ab468d69b866f7132300de82c 100644 --- a/doc/guide/logging.xml +++ b/doc/guide/logging.xml @@ -219,6 +219,7 @@ kea-dhcp4.radius-hookskea-dhcp6.radius-hookslibdhcp_radius premium hook libraryThis logger is used to log messages related to the operation of the Radius Hook Library. kea-dhcp4.stat-cmds-hookskea-dhcp6.stat-cmds-hookslibdhcp_stat_cmds hook libraryThis logger is used to log messages related to the operation of the Statistics Commands hooks library. In general, these will pertain to loading and unloading the library and the execution of commands by the library. kea-dhcp4.subnet-cmds-hookskea-dhcp6.subnet-cmds-hookslibdhcp_subnet_cmds hook libraryThis logger is used to log messages related to the operation of the Subnet Commands hooks library. In general, these will pertain to loading and unloading the library and the execution of commands by the library. + kea-dhcp4.mysql-cb-hookskea-dhcp6.mysql-cb-hookslibdhcp_mysql_cb_hooks hook libraryThis logger is used to log messages related to the operation of the MySQL Configuration Backend hooks library. kea-dhcp-ddnscoreThe root logger for the kea-dhcp-ddns daemon. All components used by this daemon inherit the settings from this logger unless there are configurations for more specialized loggers.. kea-dhcp-ddns.dctlcoreThe logger used by the kea-dhcp-ddns daemon for logging basic information about the process, received signals, and triggered reconfigurations. kea-dhcp-ddns.dhcpddnscoreThe logger used by the kea-dhcp-ddns daemon for logging events related to DDNS operations. diff --git a/src/hooks/dhcp/mysql_cb/Makefile.am b/src/hooks/dhcp/mysql_cb/Makefile.am index f965573afccd1c27c744dc6e21568ec2b73a883e..6b79a64d29ec58b0b6f3dc7e054e02312c03e265 100644 --- a/src/hooks/dhcp/mysql_cb/Makefile.am +++ b/src/hooks/dhcp/mysql_cb/Makefile.am @@ -18,6 +18,7 @@ libmysqlcb_la_SOURCES += mysql_cb_dhcp4.cc mysql_cb_dhcp4.h libmysqlcb_la_SOURCES += mysql_cb_dhcp6.cc mysql_cb_dhcp6.h libmysqlcb_la_SOURCES += mysql_cb_impl.cc mysql_cb_impl.h libmysqlcb_la_SOURCES += mysql_cb_messages.cc mysql_cb_messages.h +libmysqlcb_la_SOURCES += mysql_cb_log.cc mysql_cb_log.h libmysqlcb_la_SOURCES += mysql_query_macros_dhcp.h libmysqlcb_la_SOURCES += version.cc diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_callouts.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_callouts.cc index f1eac40b8ee20280a3776ddf2958197450057476..11b11df7262cf19787b459cfc3dd75e460257f03 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_callouts.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_callouts.cc @@ -13,7 +13,10 @@ #include #include +using namespace isc::cb; +using namespace isc::dhcp; using namespace isc::hooks; +using namespace isc::log; extern "C" { @@ -23,7 +26,7 @@ extern "C" { /// @return 0 when initialization is successful, 1 otherwise int load(LibraryHandle& /* handle */) { - + LOG_INFO(mysql_cb_logger, MYSQL_CB_INIT_OK); // Register MySQL CB factories with CB Managers isc::dhcp::MySqlConfigBackendDHCPv4::registerBackendType(); isc::dhcp::MySqlConfigBackendDHCPv6::registerBackendType(); @@ -35,7 +38,7 @@ int load(LibraryHandle& /* handle */) { /// /// @return 0 if deregistration was successful, 1 otherwise int unload() { - + LOG_INFO(mysql_cb_logger, MYSQL_CB_DEINIT_OK); // Unregister the factories and remove MySQL backends isc::dhcp::MySqlConfigBackendDHCPv4::unregisterBackendType(); isc::dhcp::MySqlConfigBackendDHCPv6::unregisterBackendType(); diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc index af2be2fdfb47fa648064d6fea86691355c286876..f7f69b0d772ad978ed055cc7d0b3a352ece6712c 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc @@ -4,6 +4,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. +#include + #include #include #include @@ -20,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -36,6 +39,7 @@ using namespace isc::cb; using namespace isc::db; using namespace isc::data; using namespace isc::asiolink; +using namespace isc::log; using namespace isc::util; namespace isc { @@ -406,6 +410,7 @@ public: last_subnet->requireClientClass(require_item->stringValue()); } } + // reservation_mode if (!out_bindings[15]->amNull()) { last_subnet->setHostReservationMode(static_cast @@ -841,7 +846,6 @@ public: conn_.insertQuery(MySqlConfigBackendDHCPv4Impl::INSERT_SUBNET4_SERVER, in_server_bindings); - } catch (const DuplicateEntry&) { deletePools4(subnet); deleteOptions4(server_selector, subnet); @@ -1049,6 +1053,7 @@ public: if (!out_bindings[2]->amNull()) { last_network->allowClientClass(out_bindings[2]->getString()); } + // interface if (!out_bindings[3]->amNull()) { last_network->setIface(out_bindings[3]->getString()); @@ -1463,7 +1468,6 @@ public: MySqlBinding::createTimestamp(option->getModificationTime()) }; - boost::scoped_ptr transaction; // Only start new transaction if specified to do so. This function may // be called from within an existing transaction in which case we @@ -2270,8 +2274,7 @@ TaggedStatementArray tagged_statements = { { }; // end anonymous namespace -MySqlConfigBackendDHCPv4Impl:: -MySqlConfigBackendDHCPv4Impl(const DatabaseConnection::ParameterMap& parameters) +MySqlConfigBackendDHCPv4Impl::MySqlConfigBackendDHCPv4Impl(const DatabaseConnection::ParameterMap& parameters) : MySqlConfigBackendImpl(parameters) { // Prepare query statements. Those are will be only used to retrieve // information from the database, so they can be used even if the @@ -2281,65 +2284,87 @@ MySqlConfigBackendDHCPv4Impl(const DatabaseConnection::ParameterMap& parameters) // tagged_statements.begin() + WRITE_STMTS_BEGIN); } -MySqlConfigBackendDHCPv4:: -MySqlConfigBackendDHCPv4(const DatabaseConnection::ParameterMap& parameters) +MySqlConfigBackendDHCPv4::MySqlConfigBackendDHCPv4(const DatabaseConnection::ParameterMap& parameters) : impl_(new MySqlConfigBackendDHCPv4Impl(parameters)) { } Subnet4Ptr MySqlConfigBackendDHCPv4::getSubnet4(const ServerSelector& server_selector, const std::string& subnet_prefix) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_SUBNET4_BY_PREFIX) + .arg(subnet_prefix); return (impl_->getSubnet4(server_selector, subnet_prefix)); } Subnet4Ptr MySqlConfigBackendDHCPv4::getSubnet4(const ServerSelector& server_selector, const SubnetID& subnet_id) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_SUBNET4_BY_SUBNET_ID) + .arg(subnet_id); return (impl_->getSubnet4(server_selector, subnet_id)); } Subnet4Collection MySqlConfigBackendDHCPv4::getAllSubnets4(const ServerSelector& server_selector) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_SUBNETS4); Subnet4Collection subnets; impl_->getAllSubnets4(server_selector, subnets); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_SUBNETS4_RESULT) + .arg(subnets.size()); return (subnets); } Subnet4Collection MySqlConfigBackendDHCPv4::getModifiedSubnets4(const ServerSelector& server_selector, const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_SUBNETS4) + .arg(util::ptimeToText(modification_time)); Subnet4Collection subnets; impl_->getModifiedSubnets4(server_selector, modification_time, subnets); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_SUBNETS4_RESULT) + .arg(subnets.size()); return (subnets); } Subnet4Collection MySqlConfigBackendDHCPv4::getSharedNetworkSubnets4(const ServerSelector& server_selector, const std::string& shared_network_name) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4) + .arg(shared_network_name); Subnet4Collection subnets; impl_->getSharedNetworkSubnets4(server_selector, shared_network_name, subnets); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4_RESULT) + .arg(subnets.size()); return (subnets); } SharedNetwork4Ptr MySqlConfigBackendDHCPv4::getSharedNetwork4(const ServerSelector& server_selector, const std::string& name) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_SHARED_NETWORK4) + .arg(name); return (impl_->getSharedNetwork4(server_selector, name)); } SharedNetwork4Collection MySqlConfigBackendDHCPv4::getAllSharedNetworks4(const ServerSelector& server_selector) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_SHARED_NETWORKS4); SharedNetwork4Collection shared_networks; impl_->getAllSharedNetworks4(server_selector, shared_networks); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_SHARED_NETWORKS4_RESULT) + .arg(shared_networks.size()); return (shared_networks); } SharedNetwork4Collection -MySqlConfigBackendDHCPv4:: -getModifiedSharedNetworks4(const ServerSelector& server_selector, - const boost::posix_time::ptime& modification_time) const { +MySqlConfigBackendDHCPv4::getModifiedSharedNetworks4(const ServerSelector& server_selector, + const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4) + .arg(util::ptimeToText(modification_time)); SharedNetwork4Collection shared_networks; impl_->getModifiedSharedNetworks4(server_selector, modification_time, shared_networks); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4_RESULT) + .arg(shared_networks.size()); return (shared_networks); } @@ -2347,25 +2372,33 @@ OptionDefinitionPtr MySqlConfigBackendDHCPv4::getOptionDef4(const ServerSelector& server_selector, const uint16_t code, const std::string& space) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_OPTION_DEF4) + .arg(code).arg(space); return (impl_->getOptionDef(MySqlConfigBackendDHCPv4Impl::GET_OPTION_DEF4_CODE_SPACE, server_selector, code, space)); } OptionDefContainer MySqlConfigBackendDHCPv4::getAllOptionDefs4(const ServerSelector& server_selector) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_OPTION_DEFS4); OptionDefContainer option_defs; impl_->getAllOptionDefs(MySqlConfigBackendDHCPv4Impl::GET_ALL_OPTION_DEFS4, server_selector, option_defs); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_OPTION_DEFS4_RESULT) + .arg(option_defs.size()); return (option_defs); } OptionDefContainer -MySqlConfigBackendDHCPv4:: -getModifiedOptionDefs4(const ServerSelector& server_selector, - const boost::posix_time::ptime& modification_time) const { +MySqlConfigBackendDHCPv4::getModifiedOptionDefs4(const ServerSelector& server_selector, + const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_OPTION_DEFS4) + .arg(util::ptimeToText(modification_time)); OptionDefContainer option_defs; impl_->getModifiedOptionDefs(MySqlConfigBackendDHCPv4Impl::GET_MODIFIED_OPTION_DEFS4, server_selector, modification_time, option_defs); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_OPTION_DEFS4_RESULT) + .arg(option_defs.size()); return (option_defs); } @@ -2373,49 +2406,63 @@ OptionDescriptorPtr MySqlConfigBackendDHCPv4::getOption4(const ServerSelector& server_selector, const uint16_t code, const std::string& space) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_OPTION4) + .arg(code).arg(space); return (impl_->getOption(MySqlConfigBackendDHCPv4Impl::GET_OPTION4_CODE_SPACE, Option::V4, server_selector, code, space)); } OptionContainer MySqlConfigBackendDHCPv4::getAllOptions4(const ServerSelector& server_selector) const { - return (impl_->getAllOptions(MySqlConfigBackendDHCPv4Impl::GET_ALL_OPTIONS4, - Option::V4, server_selector)); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_OPTIONS4); + OptionContainer options = impl_->getAllOptions(MySqlConfigBackendDHCPv4Impl::GET_ALL_OPTIONS4, + Option::V4, server_selector); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_OPTIONS4_RESULT) + .arg(options.size()); + return (options); } OptionContainer -MySqlConfigBackendDHCPv4:: -getModifiedOptions4(const ServerSelector& server_selector, - const boost::posix_time::ptime& modification_time) const { - return (impl_->getModifiedOptions(MySqlConfigBackendDHCPv4Impl::GET_MODIFIED_OPTIONS4, - Option::V4, server_selector, modification_time)); +MySqlConfigBackendDHCPv4::getModifiedOptions4(const ServerSelector& server_selector, + const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_OPTIONS4) + .arg(util::ptimeToText(modification_time)); + OptionContainer options = impl_->getModifiedOptions(MySqlConfigBackendDHCPv4Impl::GET_MODIFIED_OPTIONS4, + Option::V4, server_selector, modification_time); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_OPTIONS4_RESULT) + .arg(options.size()); + return (options); } StampedValuePtr MySqlConfigBackendDHCPv4::getGlobalParameter4(const ServerSelector& server_selector, const std::string& name) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_GLOBAL_PARAMETER4) + .arg(name); return (impl_->getGlobalParameter4(server_selector, name)); } StampedValueCollection MySqlConfigBackendDHCPv4::getAllGlobalParameters4(const ServerSelector& server_selector) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4); StampedValueCollection parameters; - auto tags = impl_->getServerTags(server_selector); for (auto tag : tags) { MySqlBindingCollection in_bindings = { MySqlBinding::createString(tag) }; impl_->getGlobalParameters(MySqlConfigBackendDHCPv4Impl::GET_ALL_GLOBAL_PARAMETERS4, in_bindings, parameters); } + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4_RESULT) + .arg(parameters.size()); return (parameters); } StampedValueCollection -MySqlConfigBackendDHCPv4:: -getModifiedGlobalParameters4(const db::ServerSelector& server_selector, - const boost::posix_time::ptime& modification_time) const { +MySqlConfigBackendDHCPv4::getModifiedGlobalParameters4(const db::ServerSelector& server_selector, + const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4) + .arg(util::ptimeToText(modification_time)); StampedValueCollection parameters; - auto tags = impl_->getServerTags(server_selector); for (auto tag : tags) { MySqlBindingCollection in_bindings = { @@ -2425,42 +2472,52 @@ getModifiedGlobalParameters4(const db::ServerSelector& server_selector, impl_->getGlobalParameters(MySqlConfigBackendDHCPv4Impl::GET_MODIFIED_GLOBAL_PARAMETERS4, in_bindings, parameters); } - + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4_RESULT) + .arg(parameters.size()); return (parameters); } AuditEntryCollection -MySqlConfigBackendDHCPv4:: -getRecentAuditEntries(const db::ServerSelector& server_selector, - const boost::posix_time::ptime& modification_time) const { +MySqlConfigBackendDHCPv4::getRecentAuditEntries(const db::ServerSelector& server_selector, + const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4) + .arg(util::ptimeToText(modification_time)); AuditEntryCollection audit_entries; impl_->getRecentAuditEntries(MySqlConfigBackendDHCPv4Impl::GET_AUDIT_ENTRIES4_TIME, server_selector, modification_time, audit_entries); - + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4_RESULT) + .arg(audit_entries.size()); return (audit_entries); } void MySqlConfigBackendDHCPv4::createUpdateSubnet4(const ServerSelector& server_selector, const Subnet4Ptr& subnet) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_SUBNET4) + .arg(subnet); impl_->createUpdateSubnet4(server_selector, subnet); } void MySqlConfigBackendDHCPv4::createUpdateSharedNetwork4(const ServerSelector& server_selector, const SharedNetwork4Ptr& shared_network) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK4) + .arg(shared_network->getName()); impl_->createUpdateSharedNetwork4(server_selector, shared_network); } void MySqlConfigBackendDHCPv4::createUpdateOptionDef4(const ServerSelector& server_selector, const OptionDefinitionPtr& option_def) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_OPTION_DEF4) + .arg(option_def->getName()).arg(option_def->getCode()); impl_->createUpdateOptionDef4(server_selector, option_def); } void MySqlConfigBackendDHCPv4::createUpdateOption4(const ServerSelector& server_selector, const OptionDescriptorPtr& option) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_OPTION4); impl_->createUpdateOption4(server_selector, option); } @@ -2468,6 +2525,8 @@ void MySqlConfigBackendDHCPv4::createUpdateOption4(const db::ServerSelector& server_selector, const std::string& shared_network_name, const OptionDescriptorPtr& option) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION4) + .arg(shared_network_name); impl_->createUpdateOption4(server_selector, shared_network_name, option, false); } @@ -2475,6 +2534,8 @@ void MySqlConfigBackendDHCPv4::createUpdateOption4(const ServerSelector& server_selector, const SubnetID& subnet_id, const OptionDescriptorPtr& option) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION4) + .arg(subnet_id); impl_->createUpdateOption4(server_selector, subnet_id, option, false); } @@ -2483,6 +2544,8 @@ MySqlConfigBackendDHCPv4::createUpdateOption4(const ServerSelector& server_selec const asiolink::IOAddress& pool_start_address, const asiolink::IOAddress& pool_end_address, const OptionDescriptorPtr& option) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION4) + .arg(pool_start_address.toText()).arg(pool_end_address.toText()); impl_->createUpdateOption4(server_selector, pool_start_address, pool_end_address, option); } @@ -2490,76 +2553,118 @@ MySqlConfigBackendDHCPv4::createUpdateOption4(const ServerSelector& server_selec void MySqlConfigBackendDHCPv4::createUpdateGlobalParameter4(const ServerSelector& server_selector, const StampedValuePtr& value) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER4) + .arg(value->getName()); impl_->createUpdateGlobalParameter4(server_selector, value); } uint64_t MySqlConfigBackendDHCPv4::deleteSubnet4(const ServerSelector& server_selector, const std::string& subnet_prefix) { - return(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) + .arg(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 MySqlConfigBackendDHCPv4::deleteSubnet4(const ServerSelector& server_selector, const SubnetID& subnet_id) { - return (impl_->deleteSubnet4(server_selector, subnet_id)); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4) + .arg(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) { - return (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); + 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 MySqlConfigBackendDHCPv4::deleteSharedNetworkSubnets4(const db::ServerSelector& server_selector, const std::string& 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)); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4) + .arg(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 MySqlConfigBackendDHCPv4::deleteSharedNetwork4(const ServerSelector& server_selector, const std::string& name) { - return (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) + .arg(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) { - return (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); + 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 MySqlConfigBackendDHCPv4::deleteOptionDef4(const ServerSelector& server_selector, const uint16_t code, const std::string& space) { - return (impl_->deleteOptionDef4(server_selector, code, space)); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_OPTION_DEF4) + .arg(code).arg(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) { - return (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); + 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 MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& server_selector, const uint16_t code, const std::string& space) { - return (impl_->deleteOption4(server_selector, code, space)); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_OPTION4) + .arg(code).arg(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 @@ -2567,8 +2672,13 @@ MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& server_selector, const std::string& shared_network_name, const uint16_t code, const std::string& space) { - return (impl_->deleteOption4(server_selector, shared_network_name, - code, space)); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4) + .arg(shared_network_name).arg(code).arg(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 @@ -2576,7 +2686,12 @@ MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& server_selector, const SubnetID& subnet_id, const uint16_t code, const std::string& space) { - return (impl_->deleteOption4(server_selector, subnet_id, code, space)); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4) + .arg(subnet_id).arg(code).arg(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 @@ -2585,43 +2700,60 @@ MySqlConfigBackendDHCPv4::deleteOption4(const ServerSelector& server_selector, const asiolink::IOAddress& pool_end_address, const uint16_t code, const std::string& space) { - return (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) + .arg(pool_start_address.toText()).arg(pool_end_address.toText()).arg(code).arg(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 MySqlConfigBackendDHCPv4::deleteGlobalParameter4(const ServerSelector& server_selector, const std::string& name) { - return (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) + .arg(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) { - return (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); + 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 MySqlConfigBackendDHCPv4::getType() const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_TYPE4); return (impl_->getType()); } std::string MySqlConfigBackendDHCPv4::getHost() const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_HOST4); return (impl_->getHost()); } uint16_t MySqlConfigBackendDHCPv4::getPort() const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_PORT4); return (impl_->getPort()); } bool MySqlConfigBackendDHCPv4::registerBackendType() { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_REGISTER_BACKEND_TYPE4); return ( dhcp::ConfigBackendDHCPv4Mgr::instance().registerBackendFactory("mysql", [](const db::DatabaseConnection::ParameterMap& params) -> dhcp::ConfigBackendDHCPv4Ptr { @@ -2632,6 +2764,7 @@ MySqlConfigBackendDHCPv4::registerBackendType() { void MySqlConfigBackendDHCPv4::unregisterBackendType() { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_UNREGISTER_BACKEND_TYPE4); dhcp::ConfigBackendDHCPv4Mgr::instance().unregisterBackendFactory("mysql"); } diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h index df2b7dbe251d3bd32c8a78eee03fe1f352cddd06..821d2be5ada9b7f7486dc47c4d54b3d2aadd70e3 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h @@ -9,6 +9,7 @@ #include #include +#include #include namespace isc { diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc index 629b98b59a71b5b74a341f553280363374f79d7f..a15c0a838e025db67845efbc521b6b1eae6ed5e6 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc @@ -1,9 +1,11 @@ -// Copyright (C) 2019 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. +#include + #include #include #include @@ -21,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -37,6 +40,7 @@ using namespace isc::cb; using namespace isc::db; using namespace isc::data; using namespace isc::asiolink; +using namespace isc::log; using namespace isc::util; namespace isc { @@ -956,7 +960,6 @@ public: conn_.insertQuery(MySqlConfigBackendDHCPv6Impl::INSERT_SUBNET6_SERVER, in_server_bindings); - } catch (const DuplicateEntry&) { deletePools6(subnet); deletePdPools6(subnet); @@ -1555,8 +1558,8 @@ public: MySqlTransaction transaction(conn_); OptionDescriptorPtr existing_option = - getOption(GET_OPTION6_CODE_SPACE, Option::V6, server_selector, - option->option_->getType(), option->space_name_); + getOption(GET_OPTION6_CODE_SPACE, Option::V6, server_selector, + option->option_->getType(), option->space_name_); // Create scoped audit revision. As long as this instance exists // no new audit revisions are created in any subsequent calls. @@ -1616,7 +1619,6 @@ public: MySqlBinding::createNull() }; - boost::scoped_ptr transaction; // Only start new transaction if specified to do so. This function may // be called from within an existing transaction in which case we @@ -1626,10 +1628,10 @@ public: } OptionDescriptorPtr existing_option = - getOption(GET_OPTION6_SUBNET_ID_CODE_SPACE, Option::V6, - server_selector, subnet_id, - option->option_->getType(), - option->space_name_); + getOption(GET_OPTION6_SUBNET_ID_CODE_SPACE, Option::V6, + server_selector, subnet_id, + option->option_->getType(), + option->space_name_); // Create scoped audit revision. As long as this instance exists // no new audit revisions are created in any subsequent calls. @@ -2559,8 +2561,7 @@ TaggedStatementArray tagged_statements = { { }; // end anonymous namespace -MySqlConfigBackendDHCPv6Impl:: -MySqlConfigBackendDHCPv6Impl(const DatabaseConnection::ParameterMap& parameters) +MySqlConfigBackendDHCPv6Impl::MySqlConfigBackendDHCPv6Impl(const DatabaseConnection::ParameterMap& parameters) : MySqlConfigBackendImpl(parameters) { // Prepare query statements. Those are will be only used to retrieve // information from the database, so they can be used even if the @@ -2570,65 +2571,87 @@ MySqlConfigBackendDHCPv6Impl(const DatabaseConnection::ParameterMap& parameters) // tagged_statements.begin() + WRITE_STMTS_BEGIN); } -MySqlConfigBackendDHCPv6:: -MySqlConfigBackendDHCPv6(const DatabaseConnection::ParameterMap& parameters) +MySqlConfigBackendDHCPv6::MySqlConfigBackendDHCPv6(const DatabaseConnection::ParameterMap& parameters) : impl_(new MySqlConfigBackendDHCPv6Impl(parameters)) { } Subnet6Ptr MySqlConfigBackendDHCPv6::getSubnet6(const ServerSelector& server_selector, const std::string& subnet_prefix) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_SUBNET6_BY_PREFIX) + .arg(subnet_prefix); return (impl_->getSubnet6(server_selector, subnet_prefix)); } Subnet6Ptr MySqlConfigBackendDHCPv6::getSubnet6(const ServerSelector& server_selector, const SubnetID& subnet_id) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_SUBNET6_BY_SUBNET_ID) + .arg(subnet_id); return (impl_->getSubnet6(server_selector, subnet_id)); } Subnet6Collection MySqlConfigBackendDHCPv6::getAllSubnets6(const ServerSelector& server_selector) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_SUBNETS6); Subnet6Collection subnets; impl_->getAllSubnets6(server_selector, subnets); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_SUBNETS6_RESULT) + .arg(subnets.size()); return (subnets); } Subnet6Collection MySqlConfigBackendDHCPv6::getModifiedSubnets6(const ServerSelector& server_selector, const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_SUBNETS6) + .arg(util::ptimeToText(modification_time)); Subnet6Collection subnets; impl_->getModifiedSubnets6(server_selector, modification_time, subnets); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_SUBNETS6_RESULT) + .arg(subnets.size()); return (subnets); } Subnet6Collection MySqlConfigBackendDHCPv6::getSharedNetworkSubnets6(const ServerSelector& server_selector, const std::string& shared_network_name) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6) + .arg(shared_network_name); Subnet6Collection subnets; impl_->getSharedNetworkSubnets6(server_selector, shared_network_name, subnets); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6_RESULT) + .arg(subnets.size()); return (subnets); } SharedNetwork6Ptr MySqlConfigBackendDHCPv6::getSharedNetwork6(const ServerSelector& server_selector, const std::string& name) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_SHARED_NETWORK6) + .arg(name); return (impl_->getSharedNetwork6(server_selector, name)); } SharedNetwork6Collection MySqlConfigBackendDHCPv6::getAllSharedNetworks6(const ServerSelector& server_selector) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_SHARED_NETWORKS6); SharedNetwork6Collection shared_networks; impl_->getAllSharedNetworks6(server_selector, shared_networks); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_SHARED_NETWORKS6_RESULT) + .arg(shared_networks.size()); return (shared_networks); } SharedNetwork6Collection -MySqlConfigBackendDHCPv6:: -getModifiedSharedNetworks6(const ServerSelector& server_selector, - const boost::posix_time::ptime& modification_time) const { +MySqlConfigBackendDHCPv6::getModifiedSharedNetworks6(const ServerSelector& server_selector, + const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6) + .arg(util::ptimeToText(modification_time)); SharedNetwork6Collection shared_networks; impl_->getModifiedSharedNetworks6(server_selector, modification_time, shared_networks); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6_RESULT) + .arg(shared_networks.size()); return (shared_networks); } @@ -2636,25 +2659,33 @@ OptionDefinitionPtr MySqlConfigBackendDHCPv6::getOptionDef6(const ServerSelector& server_selector, const uint16_t code, const std::string& space) const { - return (impl_->getOptionDef(MySqlConfigBackendDHCPv6Impl::GET_OPTION_DEF6_CODE_SPACE, - server_selector, code, space)); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_OPTION_DEF6) + .arg(code).arg(space); + return (impl_->getOptionDef(MySqlConfigBackendDHCPv6Impl::GET_OPTION_DEF6_CODE_SPACE, + server_selector, code, space)); } OptionDefContainer MySqlConfigBackendDHCPv6::getAllOptionDefs6(const ServerSelector& server_selector) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_OPTION_DEFS6); OptionDefContainer option_defs; impl_->getAllOptionDefs(MySqlConfigBackendDHCPv6Impl::GET_ALL_OPTION_DEFS6, server_selector, option_defs); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_OPTION_DEFS6_RESULT) + .arg(option_defs.size()); return (option_defs); } OptionDefContainer -MySqlConfigBackendDHCPv6:: -getModifiedOptionDefs6(const ServerSelector& server_selector, - const boost::posix_time::ptime& modification_time) const { +MySqlConfigBackendDHCPv6::getModifiedOptionDefs6(const ServerSelector& server_selector, + const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_OPTION_DEFS6) + .arg(util::ptimeToText(modification_time)); OptionDefContainer option_defs; impl_->getModifiedOptionDefs(MySqlConfigBackendDHCPv6Impl::GET_MODIFIED_OPTION_DEFS6, server_selector, modification_time, option_defs); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_OPTION_DEFS6_RESULT) + .arg(option_defs.size()); return (option_defs); } @@ -2662,49 +2693,63 @@ OptionDescriptorPtr MySqlConfigBackendDHCPv6::getOption6(const ServerSelector& server_selector, const uint16_t code, const std::string& space) const { - return (impl_->getOption(MySqlConfigBackendDHCPv6Impl::GET_OPTION6_CODE_SPACE, - Option::V6, server_selector, code, space)); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_OPTION6) + .arg(code).arg(space); + return (impl_->getOption(MySqlConfigBackendDHCPv6Impl::GET_OPTION6_CODE_SPACE, + Option::V6, server_selector, code, space)); } OptionContainer MySqlConfigBackendDHCPv6::getAllOptions6(const ServerSelector& server_selector) const { - return (impl_->getAllOptions(MySqlConfigBackendDHCPv6Impl::GET_ALL_OPTIONS6, - Option::V6, server_selector)); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_OPTIONS6); + OptionContainer options = impl_->getAllOptions(MySqlConfigBackendDHCPv6Impl::GET_ALL_OPTIONS6, + Option::V6, server_selector); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_OPTIONS6_RESULT) + .arg(options.size()); + return (options); } OptionContainer -MySqlConfigBackendDHCPv6:: -getModifiedOptions6(const ServerSelector& server_selector, - const boost::posix_time::ptime& modification_time) const { - return (impl_->getModifiedOptions(MySqlConfigBackendDHCPv6Impl::GET_MODIFIED_OPTIONS6, - Option::V6, server_selector, modification_time)); +MySqlConfigBackendDHCPv6::getModifiedOptions6(const ServerSelector& server_selector, + const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_OPTIONS6) + .arg(util::ptimeToText(modification_time)); + OptionContainer options = impl_->getModifiedOptions(MySqlConfigBackendDHCPv6Impl::GET_MODIFIED_OPTIONS6, + Option::V6, server_selector, modification_time); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_OPTIONS6_RESULT) + .arg(options.size()); + return (options); } StampedValuePtr MySqlConfigBackendDHCPv6::getGlobalParameter6(const ServerSelector& server_selector, const std::string& name) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_GLOBAL_PARAMETER6) + .arg(name); return (impl_->getGlobalParameter6(server_selector, name)); } StampedValueCollection MySqlConfigBackendDHCPv6::getAllGlobalParameters6(const ServerSelector& server_selector) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6); StampedValueCollection parameters; - auto tags = impl_->getServerTags(server_selector); for (auto tag : tags) { MySqlBindingCollection in_bindings = { MySqlBinding::createString(tag) }; impl_->getGlobalParameters(MySqlConfigBackendDHCPv6Impl::GET_ALL_GLOBAL_PARAMETERS6, in_bindings, parameters); } + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6_RESULT) + .arg(parameters.size()); return (parameters); } StampedValueCollection -MySqlConfigBackendDHCPv6:: -getModifiedGlobalParameters6(const db::ServerSelector& server_selector, - const boost::posix_time::ptime& modification_time) const { +MySqlConfigBackendDHCPv6::getModifiedGlobalParameters6(const db::ServerSelector& server_selector, + const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6) + .arg(util::ptimeToText(modification_time)); StampedValueCollection parameters; - auto tags = impl_->getServerTags(server_selector); for (auto tag : tags) { MySqlBindingCollection in_bindings = { @@ -2714,42 +2759,52 @@ getModifiedGlobalParameters6(const db::ServerSelector& server_selector, impl_->getGlobalParameters(MySqlConfigBackendDHCPv6Impl::GET_MODIFIED_GLOBAL_PARAMETERS6, in_bindings, parameters); } - + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6_RESULT) + .arg(parameters.size()); return (parameters); } AuditEntryCollection -MySqlConfigBackendDHCPv6:: -getRecentAuditEntries(const db::ServerSelector& server_selector, - const boost::posix_time::ptime& modification_time) const { +MySqlConfigBackendDHCPv6::getRecentAuditEntries(const db::ServerSelector& server_selector, + const boost::posix_time::ptime& modification_time) const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6) + .arg(util::ptimeToText(modification_time)); AuditEntryCollection audit_entries; impl_->getRecentAuditEntries(MySqlConfigBackendDHCPv6Impl::GET_AUDIT_ENTRIES6_TIME, server_selector, modification_time, audit_entries); - + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6_RESULT) + .arg(audit_entries.size()); return (audit_entries); } void MySqlConfigBackendDHCPv6::createUpdateSubnet6(const ServerSelector& server_selector, const Subnet6Ptr& subnet) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_SUBNET6) + .arg(subnet); impl_->createUpdateSubnet6(server_selector, subnet); } void MySqlConfigBackendDHCPv6::createUpdateSharedNetwork6(const ServerSelector& server_selector, const SharedNetwork6Ptr& shared_network) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK6) + .arg(shared_network->getName()); impl_->createUpdateSharedNetwork6(server_selector, shared_network); } void MySqlConfigBackendDHCPv6::createUpdateOptionDef6(const ServerSelector& server_selector, const OptionDefinitionPtr& option_def) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_OPTION_DEF6) + .arg(option_def->getName()).arg(option_def->getCode()); impl_->createUpdateOptionDef6(server_selector, option_def); } void MySqlConfigBackendDHCPv6::createUpdateOption6(const ServerSelector& server_selector, const OptionDescriptorPtr& option) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_OPTION6); impl_->createUpdateOption6(server_selector, option); } @@ -2757,6 +2812,8 @@ void MySqlConfigBackendDHCPv6::createUpdateOption6(const db::ServerSelector& server_selector, const std::string& shared_network_name, const OptionDescriptorPtr& option) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6) + .arg(shared_network_name); impl_->createUpdateOption6(server_selector, shared_network_name, option, false); } @@ -2764,6 +2821,8 @@ void MySqlConfigBackendDHCPv6::createUpdateOption6(const ServerSelector& server_selector, const SubnetID& subnet_id, const OptionDescriptorPtr& option) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION6) + .arg(subnet_id); impl_->createUpdateOption6(server_selector, subnet_id, option, false); } @@ -2772,6 +2831,8 @@ MySqlConfigBackendDHCPv6::createUpdateOption6(const ServerSelector& server_selec const asiolink::IOAddress& pool_start_address, const asiolink::IOAddress& pool_end_address, const OptionDescriptorPtr& option) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION6) + .arg(pool_start_address.toText()).arg(pool_end_address.toText()); impl_->createUpdateOption6(server_selector, pool_start_address, pool_end_address, option); } @@ -2781,6 +2842,8 @@ MySqlConfigBackendDHCPv6::createUpdateOption6(const ServerSelector& server_selec const asiolink::IOAddress& pd_pool_prefix, const uint8_t pd_pool_prefix_length, const OptionDescriptorPtr& option) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_BY_PREFIX_OPTION6) + .arg(pd_pool_prefix.toText()).arg(pd_pool_prefix_length); impl_->createUpdateOption6(server_selector, pd_pool_prefix, pd_pool_prefix_length, option); } @@ -2788,76 +2851,118 @@ MySqlConfigBackendDHCPv6::createUpdateOption6(const ServerSelector& server_selec void MySqlConfigBackendDHCPv6::createUpdateGlobalParameter6(const ServerSelector& server_selector, const StampedValuePtr& value) { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER6) + .arg(value->getName()); impl_->createUpdateGlobalParameter6(server_selector, value); } uint64_t MySqlConfigBackendDHCPv6::deleteSubnet6(const ServerSelector& server_selector, const std::string& subnet_prefix) { - return(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) + .arg(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 MySqlConfigBackendDHCPv6::deleteSubnet6(const ServerSelector& server_selector, const SubnetID& subnet_id) { - return (impl_->deleteSubnet6(server_selector, subnet_id)); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6) + .arg(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) { - return (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); + 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 MySqlConfigBackendDHCPv6::deleteSharedNetworkSubnets6(const db::ServerSelector& server_selector, const std::string& 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)); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6) + .arg(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 MySqlConfigBackendDHCPv6::deleteSharedNetwork6(const ServerSelector& server_selector, const std::string& name) { - return (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) + .arg(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) { - return (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); + 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 MySqlConfigBackendDHCPv6::deleteOptionDef6(const ServerSelector& server_selector, const uint16_t code, const std::string& space) { - return (impl_->deleteOptionDef6(server_selector, code, space)); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_OPTION_DEF6) + .arg(code).arg(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) { - return (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); + 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 MySqlConfigBackendDHCPv6::deleteOption6(const ServerSelector& server_selector, const uint16_t code, const std::string& space) { - return (impl_->deleteOption6(server_selector, code, space)); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_OPTION6) + .arg(code).arg(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 @@ -2865,8 +2970,13 @@ MySqlConfigBackendDHCPv6::deleteOption6(const ServerSelector& server_selector, const std::string& shared_network_name, const uint16_t code, const std::string& space) { - return (impl_->deleteOption6(server_selector, shared_network_name, - code, space)); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6) + .arg(shared_network_name).arg(code).arg(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 @@ -2874,7 +2984,12 @@ MySqlConfigBackendDHCPv6::deleteOption6(const ServerSelector& server_selector, const SubnetID& subnet_id, const uint16_t code, const std::string& space) { - return (impl_->deleteOption6(server_selector, subnet_id, code, space)); + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6) + .arg(subnet_id).arg(code).arg(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 @@ -2883,8 +2998,13 @@ MySqlConfigBackendDHCPv6::deleteOption6(const ServerSelector& server_selector, const asiolink::IOAddress& pool_end_address, const uint16_t code, const std::string& space) { - return (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) + .arg(pool_start_address.toText()).arg(pool_end_address.toText()).arg(code).arg(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 @@ -2893,43 +3013,60 @@ MySqlConfigBackendDHCPv6::deleteOption6(const ServerSelector& server_selector, const uint8_t pd_pool_prefix_length, const uint16_t code, const std::string& space) { - return (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) + .arg(pd_pool_prefix.toText()).arg(pd_pool_prefix_length).arg(code).arg(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 MySqlConfigBackendDHCPv6::deleteGlobalParameter6(const ServerSelector& server_selector, const std::string& name) { - return (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) + .arg(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) { - return (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); + 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 MySqlConfigBackendDHCPv6::getType() const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_TYPE6); return (impl_->getType()); } std::string MySqlConfigBackendDHCPv6::getHost() const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_HOST6); return (impl_->getHost()); } uint16_t MySqlConfigBackendDHCPv6::getPort() const { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_GET_PORT6); return (impl_->getPort()); } bool MySqlConfigBackendDHCPv6::registerBackendType() { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_REGISTER_BACKEND_TYPE6); return ( dhcp::ConfigBackendDHCPv6Mgr::instance().registerBackendFactory("mysql", [](const db::DatabaseConnection::ParameterMap& params) -> dhcp::ConfigBackendDHCPv6Ptr { @@ -2940,6 +3077,7 @@ MySqlConfigBackendDHCPv6::registerBackendType() { void MySqlConfigBackendDHCPv6::unregisterBackendType() { + LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_UNREGISTER_BACKEND_TYPE6); dhcp::ConfigBackendDHCPv6Mgr::instance().unregisterBackendFactory("mysql"); } diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.h b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.h index a6d65f37e4084c5ebaa94ae0002b0e6080d29602..6a922a4d5375f3192b8f3c1e00327495f3c70778 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.h +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.h @@ -9,6 +9,7 @@ #include #include +#include #include namespace isc { diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_log.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_log.cc new file mode 100644 index 0000000000000000000000000000000000000000..3c173425efcb001372a182167904618bd2252632 --- /dev/null +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_log.cc @@ -0,0 +1,18 @@ +// Copyright (C) 2019 Internet Systems Consortium, Inc. ("ISC") +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + +#include + +#include + +namespace isc { +namespace dhcp { + +isc::log::Logger mysql_cb_logger("mysql-cb-hooks"); + +} // namespace dhcp +} // namespace isc + diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_log.h b/src/hooks/dhcp/mysql_cb/mysql_cb_log.h new file mode 100644 index 0000000000000000000000000000000000000000..7f568aec49b370dcac0b3ff99bd008ee850ca1c0 --- /dev/null +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_log.h @@ -0,0 +1,23 @@ +// Copyright (C) 2019 Internet Systems Consortium, Inc. ("ISC") +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + +#ifndef LEASE_CMD_LOG_H +#define LEASE_CMD_LOG_H + +#include +#include +#include + +namespace isc { +namespace dhcp { + +extern isc::log::Logger mysql_cb_logger; + +} // namespace dhcp +} // namespace isc + + +#endif diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.cc index cbef905e21064160901cc34ef7ae3a5039ee04a4..8c2d8a93300774f80dd4d883ce6defb9b6c9563a 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 Fri Feb 08 2019 20:57 +// File created from ../../../../src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes on Thu May 16 2019 15:00 #include #include @@ -7,6 +7,153 @@ namespace isc { namespace cb { +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION4 = "MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION4"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION6 = "MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_BY_PREFIX_OPTION6 = "MYSQL_CB_CREATE_UPDATE_BY_PREFIX_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION4 = "MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION4"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION6 = "MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER4 = "MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER4"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER6 = "MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER6"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_OPTION4 = "MYSQL_CB_CREATE_UPDATE_OPTION4"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_OPTION6 = "MYSQL_CB_CREATE_UPDATE_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_OPTION_DEF4 = "MYSQL_CB_CREATE_UPDATE_OPTION_DEF4"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_OPTION_DEF6 = "MYSQL_CB_CREATE_UPDATE_OPTION_DEF6"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK4 = "MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK4"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK6 = "MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK6"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION4 = "MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION4"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6 = "MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SUBNET4 = "MYSQL_CB_CREATE_UPDATE_SUBNET4"; +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"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6_RESULT = "MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTIONS4 = "MYSQL_CB_GET_ALL_OPTIONS4"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTIONS4_RESULT = "MYSQL_CB_GET_ALL_OPTIONS4_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTIONS6 = "MYSQL_CB_GET_ALL_OPTIONS6"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTIONS6_RESULT = "MYSQL_CB_GET_ALL_OPTIONS6_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTION_DEFS4 = "MYSQL_CB_GET_ALL_OPTION_DEFS4"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTION_DEFS4_RESULT = "MYSQL_CB_GET_ALL_OPTION_DEFS4_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTION_DEFS6 = "MYSQL_CB_GET_ALL_OPTION_DEFS6"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTION_DEFS6_RESULT = "MYSQL_CB_GET_ALL_OPTION_DEFS6_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SHARED_NETWORKS4 = "MYSQL_CB_GET_ALL_SHARED_NETWORKS4"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SHARED_NETWORKS4_RESULT = "MYSQL_CB_GET_ALL_SHARED_NETWORKS4_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SHARED_NETWORKS6 = "MYSQL_CB_GET_ALL_SHARED_NETWORKS6"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SHARED_NETWORKS6_RESULT = "MYSQL_CB_GET_ALL_SHARED_NETWORKS6_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SUBNETS4 = "MYSQL_CB_GET_ALL_SUBNETS4"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SUBNETS4_RESULT = "MYSQL_CB_GET_ALL_SUBNETS4_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SUBNETS6 = "MYSQL_CB_GET_ALL_SUBNETS6"; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SUBNETS6_RESULT = "MYSQL_CB_GET_ALL_SUBNETS6_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_GLOBAL_PARAMETER4 = "MYSQL_CB_GET_GLOBAL_PARAMETER4"; +extern const isc::log::MessageID MYSQL_CB_GET_GLOBAL_PARAMETER6 = "MYSQL_CB_GET_GLOBAL_PARAMETER6"; +extern const isc::log::MessageID MYSQL_CB_GET_HOST4 = "MYSQL_CB_GET_HOST4"; +extern const isc::log::MessageID MYSQL_CB_GET_HOST6 = "MYSQL_CB_GET_HOST6"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4 = "MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4_RESULT = "MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6 = "MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6_RESULT = "MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTIONS4 = "MYSQL_CB_GET_MODIFIED_OPTIONS4"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTIONS4_RESULT = "MYSQL_CB_GET_MODIFIED_OPTIONS4_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTIONS6 = "MYSQL_CB_GET_MODIFIED_OPTIONS6"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTIONS6_RESULT = "MYSQL_CB_GET_MODIFIED_OPTIONS6_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTION_DEFS4 = "MYSQL_CB_GET_MODIFIED_OPTION_DEFS4"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTION_DEFS4_RESULT = "MYSQL_CB_GET_MODIFIED_OPTION_DEFS4_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTION_DEFS6 = "MYSQL_CB_GET_MODIFIED_OPTION_DEFS6"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTION_DEFS6_RESULT = "MYSQL_CB_GET_MODIFIED_OPTION_DEFS6_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4 = "MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4_RESULT = "MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6 = "MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6_RESULT = "MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SUBNETS4 = "MYSQL_CB_GET_MODIFIED_SUBNETS4"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SUBNETS4_RESULT = "MYSQL_CB_GET_MODIFIED_SUBNETS4_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SUBNETS6 = "MYSQL_CB_GET_MODIFIED_SUBNETS6"; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SUBNETS6_RESULT = "MYSQL_CB_GET_MODIFIED_SUBNETS6_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_OPTION4 = "MYSQL_CB_GET_OPTION4"; +extern const isc::log::MessageID MYSQL_CB_GET_OPTION6 = "MYSQL_CB_GET_OPTION6"; +extern const isc::log::MessageID MYSQL_CB_GET_OPTION_DEF4 = "MYSQL_CB_GET_OPTION_DEF4"; +extern const isc::log::MessageID MYSQL_CB_GET_OPTION_DEF6 = "MYSQL_CB_GET_OPTION_DEF6"; +extern const isc::log::MessageID MYSQL_CB_GET_PORT4 = "MYSQL_CB_GET_PORT4"; +extern const isc::log::MessageID MYSQL_CB_GET_PORT6 = "MYSQL_CB_GET_PORT6"; +extern const isc::log::MessageID MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4 = "MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4"; +extern const isc::log::MessageID MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4_RESULT = "MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6 = "MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6"; +extern const isc::log::MessageID MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6_RESULT = "MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_SHARED_NETWORK4 = "MYSQL_CB_GET_SHARED_NETWORK4"; +extern const isc::log::MessageID MYSQL_CB_GET_SHARED_NETWORK6 = "MYSQL_CB_GET_SHARED_NETWORK6"; +extern const isc::log::MessageID MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4 = "MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4"; +extern const isc::log::MessageID MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4_RESULT = "MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6 = "MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6"; +extern const isc::log::MessageID MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6_RESULT = "MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6_RESULT"; +extern const isc::log::MessageID MYSQL_CB_GET_SUBNET4_BY_PREFIX = "MYSQL_CB_GET_SUBNET4_BY_PREFIX"; +extern const isc::log::MessageID MYSQL_CB_GET_SUBNET4_BY_SUBNET_ID = "MYSQL_CB_GET_SUBNET4_BY_SUBNET_ID"; +extern const isc::log::MessageID MYSQL_CB_GET_SUBNET6_BY_PREFIX = "MYSQL_CB_GET_SUBNET6_BY_PREFIX"; +extern const isc::log::MessageID MYSQL_CB_GET_SUBNET6_BY_SUBNET_ID = "MYSQL_CB_GET_SUBNET6_BY_SUBNET_ID"; +extern const isc::log::MessageID MYSQL_CB_GET_TYPE4 = "MYSQL_CB_GET_TYPE4"; +extern const isc::log::MessageID MYSQL_CB_GET_TYPE6 = "MYSQL_CB_GET_TYPE6"; +extern const isc::log::MessageID MYSQL_CB_INIT_OK = "MYSQL_CB_INIT_OK"; +extern const isc::log::MessageID MYSQL_CB_REGISTER_BACKEND_TYPE4 = "MYSQL_CB_REGISTER_BACKEND_TYPE4"; +extern const isc::log::MessageID MYSQL_CB_REGISTER_BACKEND_TYPE6 = "MYSQL_CB_REGISTER_BACKEND_TYPE6"; +extern const isc::log::MessageID MYSQL_CB_UNREGISTER_BACKEND_TYPE4 = "MYSQL_CB_UNREGISTER_BACKEND_TYPE4"; +extern const isc::log::MessageID MYSQL_CB_UNREGISTER_BACKEND_TYPE6 = "MYSQL_CB_UNREGISTER_BACKEND_TYPE6"; } // namespace cb } // namespace isc @@ -14,6 +161,153 @@ namespace cb { namespace { const char* values[] = { + "MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION4", "create or update option pool start: %1 pool end: %2", + "MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION6", "create or update option pool start: %1 pool end: %2", + "MYSQL_CB_CREATE_UPDATE_BY_PREFIX_OPTION6", "create or update option prefix: %1 prefix len: %2", + "MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION4", "create or update option by subnet id: %1", + "MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION6", "create or update option by subnet id: %1", + "MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER4", "create or update global parameter: %1", + "MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER6", "create or update global parameter: %1", + "MYSQL_CB_CREATE_UPDATE_OPTION4", "create or update option", + "MYSQL_CB_CREATE_UPDATE_OPTION6", "create or update option", + "MYSQL_CB_CREATE_UPDATE_OPTION_DEF4", "create or update option definition: %1 code: %2", + "MYSQL_CB_CREATE_UPDATE_OPTION_DEF6", "create or update option definition: %1 code: %2", + "MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK4", "create or update shared network: %1", + "MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK6", "create or update shared network: %1", + "MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION4", "create or update shared network: %1 option", + "MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6", "create or update shared network: %1 option", + "MYSQL_CB_CREATE_UPDATE_SUBNET4", "create or update subnet: %1", + "MYSQL_CB_CREATE_UPDATE_SUBNET6", "create or update subnet: %1", + "MYSQL_CB_DEINIT_OK", "unloading MYSQAL CB hooks library successful", + "MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4", "delete all global parameters", + "MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6", "delete all global parameters", + "MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_ALL_OPTION_DEFS4", "delete all option definitions", + "MYSQL_CB_DELETE_ALL_OPTION_DEFS4_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_ALL_OPTION_DEFS6", "delete all option definitions", + "MYSQL_CB_DELETE_ALL_OPTION_DEFS6_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4", "delete all shared networks", + "MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6", "delete all shared networks", + "MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_ALL_SUBNETS4", "delete all subnets", + "MYSQL_CB_DELETE_ALL_SUBNETS4_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_ALL_SUBNETS6", "delete all subnets", + "MYSQL_CB_DELETE_ALL_SUBNETS6_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_BY_POOL_OPTION4", "delete 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 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 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 subnet by prefix: %1", + "MYSQL_CB_DELETE_BY_PREFIX_SUBNET4_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_BY_PREFIX_SUBNET6", "delete subnet by prefix: %1", + "MYSQL_CB_DELETE_BY_PREFIX_SUBNET6_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4", "delete 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 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 subnet by subnet id: %1", + "MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6", "delete subnet by subnet id: %1", + "MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_GLOBAL_PARAMETER4", "delete global parameter: %1", + "MYSQL_CB_DELETE_GLOBAL_PARAMETER4_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_GLOBAL_PARAMETER6", "delete global parameter: %1", + "MYSQL_CB_DELETE_GLOBAL_PARAMETER6_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_OPTION4", "delete option code: %1 space: %2", + "MYSQL_CB_DELETE_OPTION4_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_OPTION6", "delete option code: %1 space: %2", + "MYSQL_CB_DELETE_OPTION6_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_OPTION_DEF4", "delete option definition code: %1 space: %2", + "MYSQL_CB_DELETE_OPTION_DEF4_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_OPTION_DEF6", "delete option definition code: %1 space: %2", + "MYSQL_CB_DELETE_OPTION_DEF6_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_SHARED_NETWORK4", "delete shared network: %1", + "MYSQL_CB_DELETE_SHARED_NETWORK4_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_SHARED_NETWORK6", "delete shared network: %1", + "MYSQL_CB_DELETE_SHARED_NETWORK6_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4", "delete 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 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 shared network: %1 subnets", + "MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4_RESULT", "deleted: %1 entries", + "MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6", "delete shared network: %1 subnets", + "MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6_RESULT", "deleted: %1 entries", + "MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4", "retrieving all global parameters", + "MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6", "retrieving all global parameters", + "MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_ALL_OPTIONS4", "retrieving all options", + "MYSQL_CB_GET_ALL_OPTIONS4_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_ALL_OPTIONS6", "retrieving all options", + "MYSQL_CB_GET_ALL_OPTIONS6_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_ALL_OPTION_DEFS4", "retrieving all option definitions", + "MYSQL_CB_GET_ALL_OPTION_DEFS4_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_ALL_OPTION_DEFS6", "retrieving all option definitions", + "MYSQL_CB_GET_ALL_OPTION_DEFS6_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_ALL_SHARED_NETWORKS4", "retrieving all shared networks", + "MYSQL_CB_GET_ALL_SHARED_NETWORKS4_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_ALL_SHARED_NETWORKS6", "retrieving all shared networks", + "MYSQL_CB_GET_ALL_SHARED_NETWORKS6_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_ALL_SUBNETS4", "retrieving all subnets", + "MYSQL_CB_GET_ALL_SUBNETS4_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_ALL_SUBNETS6", "retrieving all subnets", + "MYSQL_CB_GET_ALL_SUBNETS6_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_GLOBAL_PARAMETER4", "retrieving global parameter: %1", + "MYSQL_CB_GET_GLOBAL_PARAMETER6", "retrieving global parameter: %1", + "MYSQL_CB_GET_HOST4", "get host", + "MYSQL_CB_GET_HOST6", "get host", + "MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4", "retrieving modified global parameters from: %1", + "MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6", "retrieving modified global parameters from: %1", + "MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_MODIFIED_OPTIONS4", "retrieving modified options from: %1", + "MYSQL_CB_GET_MODIFIED_OPTIONS4_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_MODIFIED_OPTIONS6", "retrieving modified options from: %1", + "MYSQL_CB_GET_MODIFIED_OPTIONS6_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_MODIFIED_OPTION_DEFS4", "retrieving modified option definitions from: %1", + "MYSQL_CB_GET_MODIFIED_OPTION_DEFS4_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_MODIFIED_OPTION_DEFS6", "retrieving modified option definitions from: %1", + "MYSQL_CB_GET_MODIFIED_OPTION_DEFS6_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4", "retrieving modified shared networks from: %1", + "MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6", "retrieving modified shared networks from: %1", + "MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_MODIFIED_SUBNETS4", "retrieving modified subnets from: %1", + "MYSQL_CB_GET_MODIFIED_SUBNETS4_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_MODIFIED_SUBNETS6", "retrieving modified subnets from: %1", + "MYSQL_CB_GET_MODIFIED_SUBNETS6_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_OPTION4", "retrieving option code: %1 space: %2", + "MYSQL_CB_GET_OPTION6", "retrieving option code: %1 space: %2", + "MYSQL_CB_GET_OPTION_DEF4", "retrieving option definition code: %1 space: %2", + "MYSQL_CB_GET_OPTION_DEF6", "retrieving option definition code: %1 space: %2", + "MYSQL_CB_GET_PORT4", "get port", + "MYSQL_CB_GET_PORT6", "get port", + "MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4", "retrieving audit entries from: %1", + "MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6", "retrieving audit entries from: %1", + "MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_SHARED_NETWORK4", "retrieving shared network: %1", + "MYSQL_CB_GET_SHARED_NETWORK6", "retrieving shared network: %1", + "MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4", "retrieving shared network: %1 subnets", + "MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6", "retrieving shared network: %1 subnets", + "MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6_RESULT", "retrieving: %1 elements", + "MYSQL_CB_GET_SUBNET4_BY_PREFIX", "retrieving subnet by prefix: %1", + "MYSQL_CB_GET_SUBNET4_BY_SUBNET_ID", "retrieving subnet by subnet id: %1", + "MYSQL_CB_GET_SUBNET6_BY_PREFIX", "retrieving subnet by prefix: %1", + "MYSQL_CB_GET_SUBNET6_BY_SUBNET_ID", "retrieving subnet by subnet id: %1", + "MYSQL_CB_GET_TYPE4", "get type", + "MYSQL_CB_GET_TYPE6", "get type", + "MYSQL_CB_INIT_OK", "loading MYSQL CB hooks library successful", + "MYSQL_CB_REGISTER_BACKEND_TYPE4", "register backend", + "MYSQL_CB_REGISTER_BACKEND_TYPE6", "register backend", + "MYSQL_CB_UNREGISTER_BACKEND_TYPE4", "unregister backend", + "MYSQL_CB_UNREGISTER_BACKEND_TYPE6", "unregister backend", NULL }; diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.h b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.h index 255b4d16c1314721a6b76a52efa534dd8b0cc9b4..579ce9d75851f5914a0d98edde8f20c51b2f70f6 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 Fri Feb 08 2019 20:57 +// File created from ../../../../src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes on Thu May 16 2019 15:00 #ifndef MYSQL_CB_MESSAGES_H #define MYSQL_CB_MESSAGES_H @@ -8,6 +8,153 @@ namespace isc { namespace cb { +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION4; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION6; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_BY_PREFIX_OPTION6; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION4; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION6; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER4; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER6; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_OPTION4; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_OPTION6; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_OPTION_DEF4; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_OPTION_DEF6; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK4; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK6; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION4; +extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6; +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; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTIONS4; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTIONS4_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTIONS6; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTIONS6_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTION_DEFS4; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTION_DEFS4_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTION_DEFS6; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_OPTION_DEFS6_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SHARED_NETWORKS4; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SHARED_NETWORKS4_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SHARED_NETWORKS6; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SHARED_NETWORKS6_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SUBNETS4; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SUBNETS4_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SUBNETS6; +extern const isc::log::MessageID MYSQL_CB_GET_ALL_SUBNETS6_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_GLOBAL_PARAMETER4; +extern const isc::log::MessageID MYSQL_CB_GET_GLOBAL_PARAMETER6; +extern const isc::log::MessageID MYSQL_CB_GET_HOST4; +extern const isc::log::MessageID MYSQL_CB_GET_HOST6; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTIONS4; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTIONS4_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTIONS6; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTIONS6_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTION_DEFS4; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTION_DEFS4_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTION_DEFS6; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_OPTION_DEFS6_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SUBNETS4; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SUBNETS4_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SUBNETS6; +extern const isc::log::MessageID MYSQL_CB_GET_MODIFIED_SUBNETS6_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_OPTION4; +extern const isc::log::MessageID MYSQL_CB_GET_OPTION6; +extern const isc::log::MessageID MYSQL_CB_GET_OPTION_DEF4; +extern const isc::log::MessageID MYSQL_CB_GET_OPTION_DEF6; +extern const isc::log::MessageID MYSQL_CB_GET_PORT4; +extern const isc::log::MessageID MYSQL_CB_GET_PORT6; +extern const isc::log::MessageID MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4; +extern const isc::log::MessageID MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6; +extern const isc::log::MessageID MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_SHARED_NETWORK4; +extern const isc::log::MessageID MYSQL_CB_GET_SHARED_NETWORK6; +extern const isc::log::MessageID MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4; +extern const isc::log::MessageID MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6; +extern const isc::log::MessageID MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6_RESULT; +extern const isc::log::MessageID MYSQL_CB_GET_SUBNET4_BY_PREFIX; +extern const isc::log::MessageID MYSQL_CB_GET_SUBNET4_BY_SUBNET_ID; +extern const isc::log::MessageID MYSQL_CB_GET_SUBNET6_BY_PREFIX; +extern const isc::log::MessageID MYSQL_CB_GET_SUBNET6_BY_SUBNET_ID; +extern const isc::log::MessageID MYSQL_CB_GET_TYPE4; +extern const isc::log::MessageID MYSQL_CB_GET_TYPE6; +extern const isc::log::MessageID MYSQL_CB_INIT_OK; +extern const isc::log::MessageID MYSQL_CB_REGISTER_BACKEND_TYPE4; +extern const isc::log::MessageID MYSQL_CB_REGISTER_BACKEND_TYPE6; +extern const isc::log::MessageID MYSQL_CB_UNREGISTER_BACKEND_TYPE4; +extern const isc::log::MessageID MYSQL_CB_UNREGISTER_BACKEND_TYPE6; } // namespace cb } // namespace isc diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes index b03f62a1e121d03bd4a56cdf5211280f7a1c52e9..1009a7ac1566e17bdd3fe94d14b6e0d73e0de6eb 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes @@ -1,3 +1,446 @@ -# Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC") $NAMESPACE isc::cb + +% MYSQL_CB_INIT_OK loading MYSQL CB hooks library successful +This informational message indicates that the MySQL Configuration Backend hooks +library has been loaded successfully. + +% MYSQL_CB_DEINIT_OK unloading MYSQAL CB hooks library successful +This informational message indicates that the MySQL Configuration Backend hooks +library has been unloaded successfully. + +% MYSQL_CB_GET_SUBNET4_BY_PREFIX retrieving subnet by prefix: %1 +Debug message issued when triggered an action to retrieve subnet by prefix + +% MYSQL_CB_GET_SUBNET4_BY_SUBNET_ID retrieving subnet by subnet id: %1 +Debug message issued when triggered an action to retrieve subnet by subnet id + +% MYSQL_CB_GET_ALL_SUBNETS4 retrieving all subnets +Debug message issued when triggered an action to retrieve all subnets + +% MYSQL_CB_GET_ALL_SUBNETS4_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve all subnets + +% MYSQL_CB_GET_MODIFIED_SUBNETS4 retrieving modified subnets from: %1 +Debug message issued when triggered an action to retrieve modified subnets from specified time + +% MYSQL_CB_GET_MODIFIED_SUBNETS4_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve modified subnets from specified time + +% MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4 retrieving shared network: %1 subnets +Debug message issued when triggered an action to retrieve shared network subnets + +% MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve shared network subnets + +% MYSQL_CB_GET_SHARED_NETWORK4 retrieving shared network: %1 +Debug message issued when triggered an action to retrieve shared network + +% MYSQL_CB_GET_ALL_SHARED_NETWORKS4 retrieving all shared networks +Debug message issued when triggered an action to retrieve all shared networks + +% MYSQL_CB_GET_ALL_SHARED_NETWORKS4_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve all shared networks + +% MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4 retrieving modified shared networks from: %1 +Debug message issued when triggered an action to retrieve modified shared networks from specified time + +% MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve modified shared networks from specified time + +% MYSQL_CB_GET_OPTION_DEF4 retrieving option definition code: %1 space: %2 +Debug message issued when triggered an action to retrieve option definition + +% MYSQL_CB_GET_ALL_OPTION_DEFS4 retrieving all option definitions +Debug message issued when triggered an action to retrieve all option definitions + +% MYSQL_CB_GET_ALL_OPTION_DEFS4_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve all option definitions + +% MYSQL_CB_GET_MODIFIED_OPTION_DEFS4 retrieving modified option definitions from: %1 +Debug message issued when triggered an action to retrieve modified option definitions from specified time + +% MYSQL_CB_GET_MODIFIED_OPTION_DEFS4_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve modified option definitions from specified time + +% MYSQL_CB_GET_OPTION4 retrieving option code: %1 space: %2 +Debug message issued when triggered an action to retrieve option + +% MYSQL_CB_GET_ALL_OPTIONS4 retrieving all options +Debug message issued when triggered an action to retrieve all options + +% MYSQL_CB_GET_ALL_OPTIONS4_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve all options + +% MYSQL_CB_GET_MODIFIED_OPTIONS4 retrieving modified options from: %1 +Debug message issued when triggered an action to retrieve modified options from specified time + +% MYSQL_CB_GET_MODIFIED_OPTIONS4_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve modified options from specified time + +% MYSQL_CB_GET_GLOBAL_PARAMETER4 retrieving global parameter: %1 +Debug message issued when triggered an action to retrieve global parameter + +% MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4 retrieving all global parameters +Debug message issued when triggered an action to retrieve all global parameters + +% MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve all global parameters + +% MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4 retrieving modified global parameters from: %1 +Debug message issued when triggered an action to retrieve modified global parameters from specified time + +% MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve modified global parameters from specified time + +% MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4 retrieving audit entries from: %1 +Debug message issued when triggered an action to retrieve audit entries from specified time + +% MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve audit entries from specified time + +% MYSQL_CB_CREATE_UPDATE_SUBNET4 create or update subnet: %1 +Debug message issued when triggered an action to create or update subnet + +% MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK4 create or update shared network: %1 +Debug message issued when triggered an action to create or update shared network + +% MYSQL_CB_CREATE_UPDATE_OPTION_DEF4 create or update option definition: %1 code: %2 +Debug message issued when triggered an action to create or update option definition + +% MYSQL_CB_CREATE_UPDATE_OPTION4 create or update option +Debug message issued when triggered an action to create or update option + +% MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION4 create or update shared network: %1 option +Debug message issued when triggered an action to create or update shared network option + +% MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION4 create or update option by subnet id: %1 +Debug message issued when triggered an action to create or update option by subnet id + +% MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION4 create or update option pool start: %1 pool end: %2 +Debug message issued when triggered an action to create or update option by pool + +% MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER4 create or update global parameter: %1 +Debug message issued when triggered an action to create or update global parameter + +% MYSQL_CB_DELETE_BY_PREFIX_SUBNET4 delete subnet by prefix: %1 +Debug message issued when triggered an action to delete subnet by prefix + +% MYSQL_CB_DELETE_BY_PREFIX_SUBNET4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete subnet by prefix + +% MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4 delete subnet by subnet id: %1 +Debug message issued when triggered an action to delete 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 subnet by subnet id + +% MYSQL_CB_DELETE_ALL_SUBNETS4 delete all subnets +Debug message issued when triggered an action to delete all subnets + +% MYSQL_CB_DELETE_ALL_SUBNETS4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete all subnets + +% MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4 delete shared network: %1 subnets +Debug message issued when triggered an action to delete shared network subnets + +% MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete shared network subnets + +% MYSQL_CB_DELETE_SHARED_NETWORK4 delete shared network: %1 +Debug message issued when triggered an action to delete shared network + +% MYSQL_CB_DELETE_SHARED_NETWORK4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete shared network + +% MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4 delete all shared networks +Debug message issued when triggered an action to delete all shared networks + +% MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete all shared networks + +% MYSQL_CB_DELETE_OPTION_DEF4 delete option definition code: %1 space: %2 +Debug message issued when triggered an action to delete option definition + +% MYSQL_CB_DELETE_OPTION_DEF4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete option definition + +% MYSQL_CB_DELETE_ALL_OPTION_DEFS4 delete all option definitions +Debug message issued when triggered an action to delete all option definitions + +% MYSQL_CB_DELETE_ALL_OPTION_DEFS4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete all option definitions + +% MYSQL_CB_DELETE_OPTION4 delete option code: %1 space: %2 +Debug message issued when triggered an action to delete option + +% MYSQL_CB_DELETE_OPTION4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete option + +% MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4 delete shared network: %1 option code: %2 space: %3 +Debug message issued when triggered an action to delete shared network option + +% MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete shared network option + +% MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4 delete by subnet id: %1 option code: %2 space: %3 +Debug message issued when triggered an action to delete 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 option by subnet id + +% MYSQL_CB_DELETE_BY_POOL_OPTION4 delete pool start: %1 pool end: %2 option code: %3 space: %4 +Debug message issued when triggered an action to delete option by pool + +% MYSQL_CB_DELETE_BY_POOL_OPTION4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete option by pool + +% MYSQL_CB_DELETE_GLOBAL_PARAMETER4 delete global parameter: %1 +Debug message issued when triggered an action to delete global parameter + +% MYSQL_CB_DELETE_GLOBAL_PARAMETER4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete global parameter + +% MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4 delete all global parameters +Debug message issued when triggered an action to delete all global parameters + +% MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete all global parameters + +% MYSQL_CB_GET_TYPE4 get type +Debug message issued when triggered an action to retrieve type + +% MYSQL_CB_GET_HOST4 get host +Debug message issued when triggered an action to retrieve host + +% MYSQL_CB_GET_PORT4 get port +Debug message issued when triggered an action to retrieve port + +% MYSQL_CB_REGISTER_BACKEND_TYPE4 register backend +Debug message issued when triggered an action to register backend + +% MYSQL_CB_UNREGISTER_BACKEND_TYPE4 unregister backend +Debug message issued when triggered an action to unregister backend + +% MYSQL_CB_GET_SUBNET6_BY_PREFIX retrieving subnet by prefix: %1 +Debug message issued when triggered an action to retrieve subnet by prefix + +% MYSQL_CB_GET_SUBNET6_BY_SUBNET_ID retrieving subnet by subnet id: %1 +Debug message issued when triggered an action to retrieve subnet by subnet id + +% MYSQL_CB_GET_ALL_SUBNETS6 retrieving all subnets +Debug message issued when triggered an action to retrieve all subnets + +% MYSQL_CB_GET_ALL_SUBNETS6_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve all subnets + +% MYSQL_CB_GET_MODIFIED_SUBNETS6 retrieving modified subnets from: %1 +Debug message issued when triggered an action to retrieve modified subnets from specified time + +% MYSQL_CB_GET_MODIFIED_SUBNETS6_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve modified subnets from specified time + +% MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6 retrieving shared network: %1 subnets +Debug message issued when triggered an action to retrieve shared network subnets + +% MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve shared network subnets + +% MYSQL_CB_GET_SHARED_NETWORK6 retrieving shared network: %1 +Debug message issued when triggered an action to retrieve shared network + +% MYSQL_CB_GET_ALL_SHARED_NETWORKS6 retrieving all shared networks +Debug message issued when triggered an action to retrieve all shared networks + +% MYSQL_CB_GET_ALL_SHARED_NETWORKS6_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve all shared networks + +% MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6 retrieving modified shared networks from: %1 +Debug message issued when triggered an action to retrieve modified shared networks from specified time + +% MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve modified shared networks from specified time + +% MYSQL_CB_GET_OPTION_DEF6 retrieving option definition code: %1 space: %2 +Debug message issued when triggered an action to retrieve option definition + +% MYSQL_CB_GET_ALL_OPTION_DEFS6 retrieving all option definitions +Debug message issued when triggered an action to retrieve all option definitions + +% MYSQL_CB_GET_ALL_OPTION_DEFS6_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve all option definitions + +% MYSQL_CB_GET_MODIFIED_OPTION_DEFS6 retrieving modified option definitions from: %1 +Debug message issued when triggered an action to retrieve modified option definitions from specified time + +% MYSQL_CB_GET_MODIFIED_OPTION_DEFS6_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve modified option definitions from specified time + +% MYSQL_CB_GET_OPTION6 retrieving option code: %1 space: %2 +Debug message issued when triggered an action to retrieve option + +% MYSQL_CB_GET_ALL_OPTIONS6 retrieving all options +Debug message issued when triggered an action to retrieve all options + +% MYSQL_CB_GET_ALL_OPTIONS6_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve all options + +% MYSQL_CB_GET_MODIFIED_OPTIONS6 retrieving modified options from: %1 +Debug message issued when triggered an action to retrieve modified options from specified time + +% MYSQL_CB_GET_MODIFIED_OPTIONS6_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve modified options from specified time + +% MYSQL_CB_GET_GLOBAL_PARAMETER6 retrieving global parameter: %1 +Debug message issued when triggered an action to retrieve global parameter + +% MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6 retrieving all global parameters +Debug message issued when triggered an action to retrieve all global parameters + +% MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve all global parameters + +% MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6 retrieving modified global parameters from: %1 +Debug message issued when triggered an action to retrieve modified global parameters from specified time + +% MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve modified global parameters from specified time + +% MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6 retrieving audit entries from: %1 +Debug message issued when triggered an action to retrieve audit entries from specified time + +% MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6_RESULT retrieving: %1 elements +Debug message indicating the result of an action to retrieve audit entries from specified time + +% MYSQL_CB_CREATE_UPDATE_SUBNET6 create or update subnet: %1 +Debug message issued when triggered an action to create or update subnet + +% MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK6 create or update shared network: %1 +Debug message issued when triggered an action to create or update shared network + +% MYSQL_CB_CREATE_UPDATE_OPTION_DEF6 create or update option definition: %1 code: %2 +Debug message issued when triggered an action to create or update option definition + +% MYSQL_CB_CREATE_UPDATE_OPTION6 create or update option +Debug message issued when triggered an action to create or update option + +% MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6 create or update shared network: %1 option +Debug message issued when triggered an action to create or update shared network option + +% MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION6 create or update option by subnet id: %1 +Debug message issued when triggered an action to create or update option by subnet id + +% MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION6 create or update option pool start: %1 pool end: %2 +Debug message issued when triggered an action to create or update option by pool + +% MYSQL_CB_CREATE_UPDATE_BY_PREFIX_OPTION6 create or update option prefix: %1 prefix len: %2 +Debug message issued when triggered an action to create or update option by prefix + +% MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER6 create or update global parameter: %1 +Debug message issued when triggered an action to create or update global parameter + +% MYSQL_CB_DELETE_BY_PREFIX_SUBNET6 delete subnet by prefix: %1 +Debug message issued when triggered an action to delete subnet by prefix + +% MYSQL_CB_DELETE_BY_PREFIX_SUBNET6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete subnet by prefix + +% MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6 delete subnet by subnet id: %1 +Debug message issued when triggered an action to delete 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 subnet by subnet id + +% MYSQL_CB_DELETE_ALL_SUBNETS6 delete all subnets +Debug message issued when triggered an action to delete all subnets + +% MYSQL_CB_DELETE_ALL_SUBNETS6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete all subnets + +% MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6 delete shared network: %1 subnets +Debug message issued when triggered an action to delete shared network subnets + +% MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete shared network subnets + +% MYSQL_CB_DELETE_SHARED_NETWORK6 delete shared network: %1 +Debug message issued when triggered an action to delete shared network + +% MYSQL_CB_DELETE_SHARED_NETWORK6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete shared network + +% MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6 delete all shared networks +Debug message issued when triggered an action to delete all shared networks + +% MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete all shared networks + +% MYSQL_CB_DELETE_OPTION_DEF6 delete option definition code: %1 space: %2 +Debug message issued when triggered an action to delete option definition + +% MYSQL_CB_DELETE_OPTION_DEF6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete option definition + +% MYSQL_CB_DELETE_ALL_OPTION_DEFS6 delete all option definitions +Debug message issued when triggered an action to delete all option definitions + +% MYSQL_CB_DELETE_ALL_OPTION_DEFS6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete all option definitions + +% MYSQL_CB_DELETE_OPTION6 delete option code: %1 space: %2 +Debug message issued when triggered an action to delete option + +% MYSQL_CB_DELETE_OPTION6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete option + +% MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6 delete shared network: %1 option code: %2 space: %3 +Debug message issued when triggered an action to delete shared network option + +% MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete shared network option + +% MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6 delete by subnet id: %1 option code: %2 space: %3 +Debug message issued when triggered an action to delete 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 option by subnet id + +% MYSQL_CB_DELETE_BY_POOL_OPTION6 delete pool start: %1 pool end: %2 option code: %3 space: %4 +Debug message issued when triggered an action to delete option by pool + +% MYSQL_CB_DELETE_BY_POOL_OPTION6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete option by pool + +% MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6 delete prefix: %1 prefix len: %2 option code: %3 space: %4 +Debug message issued when triggered an action to delete option by prefix + +% MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete option by prefix + +% MYSQL_CB_DELETE_GLOBAL_PARAMETER6 delete global parameter: %1 +Debug message issued when triggered an action to delete global parameter + +% MYSQL_CB_DELETE_GLOBAL_PARAMETER6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete global parameter + +% MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6 delete all global parameters +Debug message issued when triggered an action to delete all global parameters + +% MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6_RESULT deleted: %1 entries +Debug message indicating the result of an action to delete all global parameters + +% MYSQL_CB_GET_TYPE6 get type +Debug message issued when triggered an action to retrieve type + +% MYSQL_CB_GET_HOST6 get host +Debug message issued when triggered an action to retrieve host + +% MYSQL_CB_GET_PORT6 get port +Debug message issued when triggered an action to retrieve port + +% MYSQL_CB_REGISTER_BACKEND_TYPE6 register backend +Debug message issued when triggered an action to register backend + +% MYSQL_CB_UNREGISTER_BACKEND_TYPE6 unregister backend +Debug message issued when triggered an action to unregister backend diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.mes b/src/lib/dhcpsrv/dhcpsrv_messages.mes index a6155f05da1f04263983dd81d83d95c08fca3383..845f6be5bc46c5b4a600ca4ea2ba645f8965ce99 100644 --- a/src/lib/dhcpsrv/dhcpsrv_messages.mes +++ b/src/lib/dhcpsrv/dhcpsrv_messages.mes @@ -740,7 +740,7 @@ The code has issued a begin transaction call. % DHCPSRV_MYSQL_COMMIT committing to MySQL database The code has issued a commit call. All outstanding transactions will be committed to the database. Note that depending on the MySQL settings, -the committal may not include a write to disk. +the commit may not include a write to disk. % DHCPSRV_MYSQL_DB opening MySQL lease database: %1 This informational message is logged when a DHCP server (either V4 or @@ -772,7 +772,7 @@ lease expires before considering its removal. % DHCPSRV_MYSQL_FATAL_ERROR Unrecoverable MySQL error occurred: %1 for <%2>, reason: %3 (error code: %4). An error message indicating that communication with the MySQL database server has been lost. If automatic recovery has been enabled, then the server will -attempt to recover connectivity. If not the server wil exit with a +attempt to recover the connectivity. If not the server will exit with a non-zero exit code. The cause of such an error is most likely a network issue or the MySQL server has gone down. @@ -922,7 +922,7 @@ The code has issued a begin transaction call. % DHCPSRV_PGSQL_COMMIT committing to PostgreSQL database The code has issued a commit call. All outstanding transactions will be committed to the database. Note that depending on the PostgreSQL settings, -the committal may not include a write to disk. +the commit may not include a write to disk. % DHCPSRV_PGSQL_DB opening PostgreSQL lease database: %1 This informational message is logged when a DHCP server (either V4 or @@ -956,7 +956,7 @@ lease expires before considering its removal. % DHCPSRV_PGSQL_FATAL_ERROR Unrecoverable PostgreSQL error occurred: Statement: <%1>, reason: %2 (error code: %3). An error message indicating that communication with the PostgreSQL database server has been lost. If automatic recovery has been enabled, then the server will -attempt to recover the connectivity. If not the server wil exit with a +attempt to recover the connectivity. If not the server will exit with a non-zero exit code. The cause of such an error is most likely a network issue or the PostgreSQL server has gone down.