[#642,!373] Added log messages for functions deleting servers.

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
index 61a4f7116b79b4f0ae3cfa3e0507f3d1358b799a..b318ff6495dcae3e91a7ee7baf57a7ee3e23cf7e 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
@@ -2842,16 +2842,23 @@ MySqlConfigBackendDHCPv4::deleteAllGlobalParameters4(const ServerSelector& serve
 
 uint64_t
 MySqlConfigBackendDHCPv4::deleteServer4(const ServerTag& server_tag) {
+    LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SERVER4)
+        .arg(server_tag.get());
     uint64_t result = impl_->deleteServer(MySqlConfigBackendDHCPv4Impl::CREATE_AUDIT_REVISION,
                                           MySqlConfigBackendDHCPv4Impl::DELETE_SERVER4,
                                           server_tag.get());
+    LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SERVER4_RESULT)
+        .arg(result);
     return (result);
 }
 
 uint64_t
 MySqlConfigBackendDHCPv4::deleteAllServers4() {
+    LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_SERVERS4);
     uint64_t result = impl_->deleteAllServers(MySqlConfigBackendDHCPv4Impl::CREATE_AUDIT_REVISION,
                                               MySqlConfigBackendDHCPv4Impl::DELETE_ALL_SERVERS4);
+    LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_SERVERS4_RESULT)
+        .arg(result);
     return (result);
 }
 

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
index 121531992e56363bf6f2239524ad576bca831122..efd7ed18ccbea83224220e2b779cfc8846bf7832 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
@@ -3229,16 +3229,23 @@ MySqlConfigBackendDHCPv6::deleteAllGlobalParameters6(const ServerSelector& serve
 
 uint64_t
 MySqlConfigBackendDHCPv6::deleteServer6(const ServerTag& server_tag) {
+    LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SERVER6)
+        .arg(server_tag.get());
     uint64_t result = impl_->deleteServer(MySqlConfigBackendDHCPv6Impl::CREATE_AUDIT_REVISION,
                                           MySqlConfigBackendDHCPv6Impl::DELETE_SERVER6,
                                           server_tag.get());
+    LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_SERVER6_RESULT)
+        .arg(result);
     return (result);
 }
 
 uint64_t
 MySqlConfigBackendDHCPv6::deleteAllServers6() {
+    LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_SERVERS6);
     uint64_t result = impl_->deleteAllServers(MySqlConfigBackendDHCPv6Impl::CREATE_AUDIT_REVISION,
                                               MySqlConfigBackendDHCPv6Impl::DELETE_ALL_SERVERS6);
+    LOG_DEBUG(mysql_cb_logger, DBGLVL_TRACE_BASIC, MYSQL_CB_DELETE_ALL_SERVERS6_RESULT)
+        .arg(result);
     return (result);
 }
 

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.cc
index cf84ea6f06e8f243115676f6ac98e3b4947cac8f..3309b440bb5515eba24b782a71ed8ade1e94691b 100644 (file)
--- 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 Wed Jun 12 2019 14:09
+// File created from ../../../../src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes on Mon Jun 17 2019 14:28
 
 #include <cstddef>
 #include <log/message_types.h>
@@ -35,6 +35,10 @@ extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_OPTION_DEFS4 = "MYSQL_CB_DE
 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_SERVERS4 = "MYSQL_CB_DELETE_ALL_SERVERS4";
+extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SERVERS4_RESULT = "MYSQL_CB_DELETE_ALL_SERVERS4_RESULT";
+extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SERVERS6 = "MYSQL_CB_DELETE_ALL_SERVERS6";
+extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SERVERS6_RESULT = "MYSQL_CB_DELETE_ALL_SERVERS6_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";
@@ -73,6 +77,10 @@ extern const isc::log::MessageID MYSQL_CB_DELETE_OPTION_DEF4 = "MYSQL_CB_DELETE_
 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_SERVER4 = "MYSQL_CB_DELETE_SERVER4";
+extern const isc::log::MessageID MYSQL_CB_DELETE_SERVER4_RESULT = "MYSQL_CB_DELETE_SERVER4_RESULT";
+extern const isc::log::MessageID MYSQL_CB_DELETE_SERVER6 = "MYSQL_CB_DELETE_SERVER6";
+extern const isc::log::MessageID MYSQL_CB_DELETE_SERVER6_RESULT = "MYSQL_CB_DELETE_SERVER6_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";
@@ -197,6 +205,10 @@ const char* values[] = {
     "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_SERVERS4", "delete all DHCPv4 servers",
+    "MYSQL_CB_DELETE_ALL_SERVERS4_RESULT", "deleted: %1 entries",
+    "MYSQL_CB_DELETE_ALL_SERVERS6", "delete all DHCPv6 servers",
+    "MYSQL_CB_DELETE_ALL_SERVERS6_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",
@@ -235,6 +247,10 @@ const char* values[] = {
     "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_SERVER4", "delete DHCPv4 server: %1",
+    "MYSQL_CB_DELETE_SERVER4_RESULT", "deleted: %1 entries",
+    "MYSQL_CB_DELETE_SERVER6", "delete DHCPv6 server: %1",
+    "MYSQL_CB_DELETE_SERVER6_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",

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.h b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.h
index 34334eec92bcebab6fcb2d3b29c6ce07dab828e1..679216d5c293ccbf80c3b6bf32a338d37a781cab 100644 (file)
--- 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 Wed Jun 12 2019 14:09
+// File created from ../../../../src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes on Mon Jun 17 2019 14:28
 
 #ifndef MYSQL_CB_MESSAGES_H
 #define MYSQL_CB_MESSAGES_H
@@ -36,6 +36,10 @@ 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_SERVERS4;
+extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SERVERS4_RESULT;
+extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SERVERS6;
+extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_SERVERS6_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;
@@ -74,6 +78,10 @@ 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_SERVER4;
+extern const isc::log::MessageID MYSQL_CB_DELETE_SERVER4_RESULT;
+extern const isc::log::MessageID MYSQL_CB_DELETE_SERVER6;
+extern const isc::log::MessageID MYSQL_CB_DELETE_SERVER6_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;

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes
index 3dd58b32ac82a0cd02b71743c5b911461e582aa5..1ecaba3959294edd84cb5b2b2eafe4e22ad20b1f 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes
@@ -101,6 +101,18 @@ 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_ALL_SERVERS4 delete all DHCPv4 servers
+Debug message issued when triggered an action to delete all servers.
+
+% MYSQL_CB_DELETE_ALL_SERVERS4_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete all servers.
+
+% MYSQL_CB_DELETE_ALL_SERVERS6 delete all DHCPv6 servers
+Debug message issued when triggered an action to delete all servers.
+
+% MYSQL_CB_DELETE_ALL_SERVERS6_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete all servers.
+
 % MYSQL_CB_DELETE_ALL_SUBNETS4 delete all subnets
 Debug message issued when triggered an action to delete all subnets
 
@@ -203,6 +215,18 @@ 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_SERVER4 delete DHCPv4 server: %1
+Debug message issued when triggered an action to delete a server.
+
+% MYSQL_CB_DELETE_SERVER4_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete a server.
+
+% MYSQL_CB_DELETE_SERVER6 delete DHCPv6 server: %1
+Debug message issued when triggered an action to delete a server.
+
+% MYSQL_CB_DELETE_SERVER6_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete a server.
+
 % MYSQL_CB_DELETE_SHARED_NETWORK4 delete shared network: %1
 Debug message issued when triggered an action to delete shared network