Skip to content

Commit 30dea22

Browse files
author
Razvan Becheriu
committed
[#3536] use only one loger on load and unload
1 parent 6dbb732 commit 30dea22

21 files changed

+25
-89
lines changed

‎src/hooks/dhcp/mysql/mysql_callouts.cc

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,19 @@ int load(LibraryHandle& /* handle */) {
6262
// Register MySQL CB factories with CB Managers
6363
MySqlConfigBackendDHCPv4::registerBackendType();
6464
MySqlConfigBackendDHCPv6::registerBackendType();
65-
LOG_INFO(mysql_cb_logger, MYSQL_CB_INIT_OK);
6665

6766
// Register MySQL HB factories with Host Managers
6867
HostDataSourceFactory::registerFactory("mysql",
6968
MySqlHostDataSource::factory,
7069
true,
7170
MySqlHostDataSource::getDBVersion);
72-
LOG_INFO(mysql_hb_logger, MYSQL_HB_INIT_OK);
7371

7472
// Register MySQL LB factories with Lease Managers
7573
LeaseMgrFactory::registerFactory("mysql",
7674
MySqlLeaseMgr::factory,
7775
true,
7876
MySqlLeaseMgr::getDBVersion);
79-
LOG_INFO(mysql_lb_logger, MYSQL_LB_INIT_OK);
77+
LOG_INFO(mysql_lb_logger, MYSQL_INIT_OK);
8078
return (0);
8179
}
8280

@@ -117,15 +115,13 @@ int unload() {
117115
io_service->stopAndPoll();
118116
MySqlConfigBackendImpl::setIOService(IOServicePtr());
119117
}
120-
LOG_INFO(mysql_cb_logger, MYSQL_CB_DEINIT_OK);
121118

122119
// Unregister the factories and remove MySQL backends
123120
HostDataSourceFactory::deregisterFactory("mysql", true);
124-
LOG_INFO(mysql_hb_logger, MYSQL_HB_DEINIT_OK);
125121

126122
// Unregister the factories and remove MySQL backends
127123
LeaseMgrFactory::deregisterFactory("mysql", true);
128-
LOG_INFO(mysql_lb_logger, MYSQL_LB_DEINIT_OK);
124+
LOG_INFO(mysql_lb_logger, MYSQL_DEINIT_OK);
129125
return (0);
130126
}
131127

‎src/hooks/dhcp/mysql/mysql_cb_messages.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION4 =
2828
extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6 = "MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6";
2929
extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SUBNET4 = "MYSQL_CB_CREATE_UPDATE_SUBNET4";
3030
extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SUBNET6 = "MYSQL_CB_CREATE_UPDATE_SUBNET6";
31-
extern const isc::log::MessageID MYSQL_CB_DEINIT_OK = "MYSQL_CB_DEINIT_OK";
3231
extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_CLIENT_CLASSES4 = "MYSQL_CB_DELETE_ALL_CLIENT_CLASSES4";
3332
extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_CLIENT_CLASSES4_RESULT = "MYSQL_CB_DELETE_ALL_CLIENT_CLASSES4_RESULT";
3433
extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_CLIENT_CLASSES6 = "MYSQL_CB_DELETE_ALL_CLIENT_CLASSES6";
@@ -185,7 +184,6 @@ extern const isc::log::MessageID MYSQL_CB_GET_SUBNET6_BY_PREFIX = "MYSQL_CB_GET_
185184
extern const isc::log::MessageID MYSQL_CB_GET_SUBNET6_BY_SUBNET_ID = "MYSQL_CB_GET_SUBNET6_BY_SUBNET_ID";
186185
extern const isc::log::MessageID MYSQL_CB_GET_TYPE4 = "MYSQL_CB_GET_TYPE4";
187186
extern const isc::log::MessageID MYSQL_CB_GET_TYPE6 = "MYSQL_CB_GET_TYPE6";
188-
extern const isc::log::MessageID MYSQL_CB_INIT_OK = "MYSQL_CB_INIT_OK";
189187
extern const isc::log::MessageID MYSQL_CB_NO_TLS = "MYSQL_CB_NO_TLS";
190188
extern const isc::log::MessageID MYSQL_CB_RECONNECT_ATTEMPT_FAILED4 = "MYSQL_CB_RECONNECT_ATTEMPT_FAILED4";
191189
extern const isc::log::MessageID MYSQL_CB_RECONNECT_ATTEMPT_FAILED6 = "MYSQL_CB_RECONNECT_ATTEMPT_FAILED6";
@@ -226,7 +224,6 @@ const char* values[] = {
226224
"MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6", "create or update shared network: %1 option",
227225
"MYSQL_CB_CREATE_UPDATE_SUBNET4", "create or update subnet: %1",
228226
"MYSQL_CB_CREATE_UPDATE_SUBNET6", "create or update subnet: %1",
229-
"MYSQL_CB_DEINIT_OK", "unloading MySQL CB hooks library successful",
230227
"MYSQL_CB_DELETE_ALL_CLIENT_CLASSES4", "delete all client classes",
231228
"MYSQL_CB_DELETE_ALL_CLIENT_CLASSES4_RESULT", "deleted: %1 entries",
232229
"MYSQL_CB_DELETE_ALL_CLIENT_CLASSES6", "delete all client classes",
@@ -383,7 +380,6 @@ const char* values[] = {
383380
"MYSQL_CB_GET_SUBNET6_BY_SUBNET_ID", "retrieving subnet by subnet id: %1",
384381
"MYSQL_CB_GET_TYPE4", "get type",
385382
"MYSQL_CB_GET_TYPE6", "get type",
386-
"MYSQL_CB_INIT_OK", "loading MySQL CB hooks library successful",
387383
"MYSQL_CB_NO_TLS", "TLS was required but is not used",
388384
"MYSQL_CB_RECONNECT_ATTEMPT_FAILED4", "database reconnect failed: %1",
389385
"MYSQL_CB_RECONNECT_ATTEMPT_FAILED6", "database reconnect failed: %1",

‎src/hooks/dhcp/mysql/mysql_cb_messages.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION4;
2929
extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6;
3030
extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SUBNET4;
3131
extern const isc::log::MessageID MYSQL_CB_CREATE_UPDATE_SUBNET6;
32-
extern const isc::log::MessageID MYSQL_CB_DEINIT_OK;
3332
extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_CLIENT_CLASSES4;
3433
extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_CLIENT_CLASSES4_RESULT;
3534
extern const isc::log::MessageID MYSQL_CB_DELETE_ALL_CLIENT_CLASSES6;
@@ -186,7 +185,6 @@ extern const isc::log::MessageID MYSQL_CB_GET_SUBNET6_BY_PREFIX;
186185
extern const isc::log::MessageID MYSQL_CB_GET_SUBNET6_BY_SUBNET_ID;
187186
extern const isc::log::MessageID MYSQL_CB_GET_TYPE4;
188187
extern const isc::log::MessageID MYSQL_CB_GET_TYPE6;
189-
extern const isc::log::MessageID MYSQL_CB_INIT_OK;
190188
extern const isc::log::MessageID MYSQL_CB_NO_TLS;
191189
extern const isc::log::MessageID MYSQL_CB_RECONNECT_ATTEMPT_FAILED4;
192190
extern const isc::log::MessageID MYSQL_CB_RECONNECT_ATTEMPT_FAILED6;

‎src/hooks/dhcp/mysql/mysql_cb_messages.mes

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,6 @@ Debug message issued when triggered an action to create or update subnet
8888
Logged at debug log level 40.
8989
Debug message issued when triggered an action to create or update subnet
9090

91-
% MYSQL_CB_DEINIT_OK unloading MySQL CB hooks library successful
92-
This informational message indicates that the MySQL Configuration Backend hooks
93-
library has been unloaded successfully.
94-
9591
% MYSQL_CB_DELETE_ALL_CLIENT_CLASSES4 delete all client classes
9692
Logged at debug log level 40.
9793
Debug message issued when triggered an action to delete all client classes
@@ -720,10 +716,6 @@ Debug message issued when triggered an action to retrieve type
720716
Logged at debug log level 40.
721717
Debug message issued when triggered an action to retrieve type
722718

723-
% MYSQL_CB_INIT_OK loading MySQL CB hooks library successful
724-
This informational message indicates that the MySQL Configuration Backend hooks
725-
library has been loaded successfully. Enjoy!
726-
727719
% MYSQL_CB_NO_TLS TLS was required but is not used
728720
This error message is issued when TLS for the connection was required but
729721
TLS is not used.

‎src/hooks/dhcp/mysql/mysql_hb_messages.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ extern const isc::log::MessageID MYSQL_HB_DB_READONLY = "MYSQL_HB_DB_READONLY";
1313
extern const isc::log::MessageID MYSQL_HB_DB_RECONNECT_ATTEMPT_FAILED = "MYSQL_HB_DB_RECONNECT_ATTEMPT_FAILED";
1414
extern const isc::log::MessageID MYSQL_HB_DB_RECONNECT_ATTEMPT_SCHEDULE = "MYSQL_HB_DB_RECONNECT_ATTEMPT_SCHEDULE";
1515
extern const isc::log::MessageID MYSQL_HB_DB_RECONNECT_FAILED = "MYSQL_HB_DB_RECONNECT_FAILED";
16-
extern const isc::log::MessageID MYSQL_HB_DEINIT_OK = "MYSQL_HB_DEINIT_OK";
17-
extern const isc::log::MessageID MYSQL_HB_INIT_OK = "MYSQL_HB_INIT_OK";
1816
extern const isc::log::MessageID MYSQL_HB_NO_TLS = "MYSQL_HB_NO_TLS";
1917
extern const isc::log::MessageID MYSQL_HB_TLS_CIPHER = "MYSQL_HB_TLS_CIPHER";
2018

@@ -30,8 +28,6 @@ const char* values[] = {
3028
"MYSQL_HB_DB_RECONNECT_ATTEMPT_FAILED", "database reconnect failed: %1",
3129
"MYSQL_HB_DB_RECONNECT_ATTEMPT_SCHEDULE", "scheduling attempt %1 of %2 in %3 milliseconds",
3230
"MYSQL_HB_DB_RECONNECT_FAILED", "maximum number of database reconnect attempts: %1, has been exhausted without success",
33-
"MYSQL_HB_DEINIT_OK", "unloading MySQL HB hooks library successful",
34-
"MYSQL_HB_INIT_OK", "loading MySQL HB hooks library successful",
3531
"MYSQL_HB_NO_TLS", "TLS was required but is not used",
3632
"MYSQL_HB_TLS_CIPHER", "TLS cipher: %1",
3733
NULL

‎src/hooks/dhcp/mysql/mysql_hb_messages.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ extern const isc::log::MessageID MYSQL_HB_DB_READONLY;
1414
extern const isc::log::MessageID MYSQL_HB_DB_RECONNECT_ATTEMPT_FAILED;
1515
extern const isc::log::MessageID MYSQL_HB_DB_RECONNECT_ATTEMPT_SCHEDULE;
1616
extern const isc::log::MessageID MYSQL_HB_DB_RECONNECT_FAILED;
17-
extern const isc::log::MessageID MYSQL_HB_DEINIT_OK;
18-
extern const isc::log::MessageID MYSQL_HB_INIT_OK;
1917
extern const isc::log::MessageID MYSQL_HB_NO_TLS;
2018
extern const isc::log::MessageID MYSQL_HB_TLS_CIPHER;
2119

‎src/hooks/dhcp/mysql/mysql_hb_messages.mes

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@ V6) is about to open a MySQL hosts database. The parameters of the
1212
connection including database name and username needed to access it
1313
(but not the password if any) are logged.
1414

15-
% MYSQL_HB_DEINIT_OK unloading MySQL HB hooks library successful
16-
This informational message indicates that the MySQL Host Backend hooks
17-
library has been unloaded successfully.
18-
19-
% MYSQL_HB_INIT_OK loading MySQL HB hooks library successful
20-
This informational message indicates that the MySQL Host Backend hooks
21-
library has been loaded successfully. Enjoy!
22-
2315
% MYSQL_HB_DB_GET_VERSION obtaining schema version information for the MySQL hosts database
2416
Logged at debug log level 50.
2517
A debug message issued when the server is about to obtain schema version

‎src/hooks/dhcp/mysql/mysql_lb_messages.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77
namespace isc {
88
namespace dhcp {
99

10+
extern const isc::log::MessageID MYSQL_DEINIT_OK = "MYSQL_DEINIT_OK";
11+
extern const isc::log::MessageID MYSQL_INIT_OK = "MYSQL_INIT_OK";
1012
extern const isc::log::MessageID MYSQL_LB_ADD_ADDR4 = "MYSQL_LB_ADD_ADDR4";
1113
extern const isc::log::MessageID MYSQL_LB_ADD_ADDR6 = "MYSQL_LB_ADD_ADDR6";
1214
extern const isc::log::MessageID MYSQL_LB_COMMIT = "MYSQL_LB_COMMIT";
1315
extern const isc::log::MessageID MYSQL_LB_DB = "MYSQL_LB_DB";
1416
extern const isc::log::MessageID MYSQL_LB_DB_RECONNECT_ATTEMPT_FAILED = "MYSQL_LB_DB_RECONNECT_ATTEMPT_FAILED";
1517
extern const isc::log::MessageID MYSQL_LB_DB_RECONNECT_ATTEMPT_SCHEDULE = "MYSQL_LB_DB_RECONNECT_ATTEMPT_SCHEDULE";
1618
extern const isc::log::MessageID MYSQL_LB_DB_RECONNECT_FAILED = "MYSQL_LB_DB_RECONNECT_FAILED";
17-
extern const isc::log::MessageID MYSQL_LB_DEINIT_OK = "MYSQL_LB_DEINIT_OK";
1819
extern const isc::log::MessageID MYSQL_LB_DELETED_EXPIRED_RECLAIMED = "MYSQL_LB_DELETED_EXPIRED_RECLAIMED";
1920
extern const isc::log::MessageID MYSQL_LB_DELETE_ADDR4 = "MYSQL_LB_DELETE_ADDR4";
2021
extern const isc::log::MessageID MYSQL_LB_DELETE_ADDR6 = "MYSQL_LB_DELETE_ADDR6";
@@ -45,7 +46,6 @@ extern const isc::log::MessageID MYSQL_LB_GET_SUBID_CLIENTID = "MYSQL_LB_GET_SUB
4546
extern const isc::log::MessageID MYSQL_LB_GET_SUBID_HWADDR = "MYSQL_LB_GET_SUBID_HWADDR";
4647
extern const isc::log::MessageID MYSQL_LB_GET_SUBID_PAGE6 = "MYSQL_LB_GET_SUBID_PAGE6";
4748
extern const isc::log::MessageID MYSQL_LB_GET_VERSION = "MYSQL_LB_GET_VERSION";
48-
extern const isc::log::MessageID MYSQL_LB_INIT_OK = "MYSQL_LB_INIT_OK";
4949
extern const isc::log::MessageID MYSQL_LB_NEGATIVE_LEASES_STAT = "MYSQL_LB_NEGATIVE_LEASES_STAT";
5050
extern const isc::log::MessageID MYSQL_LB_NO_TLS = "MYSQL_LB_NO_TLS";
5151
extern const isc::log::MessageID MYSQL_LB_ROLLBACK = "MYSQL_LB_ROLLBACK";
@@ -65,14 +65,15 @@ extern const isc::log::MessageID MYSQL_LB_UPGRADE_EXTENDED_INFO6_PAGE = "MYSQL_L
6565
namespace {
6666

6767
const char* values[] = {
68+
"MYSQL_DEINIT_OK", "unloading MySQL hooks library successful",
69+
"MYSQL_INIT_OK", "loading MySQL hooks library successful",
6870
"MYSQL_LB_ADD_ADDR4", "adding IPv4 lease with address %1",
6971
"MYSQL_LB_ADD_ADDR6", "adding IPv6 lease with address %1, lease type %2",
7072
"MYSQL_LB_COMMIT", "committing to MySQL database",
7173
"MYSQL_LB_DB", "opening MySQL lease database: %1",
7274
"MYSQL_LB_DB_RECONNECT_ATTEMPT_FAILED", "database reconnect failed: %1",
7375
"MYSQL_LB_DB_RECONNECT_ATTEMPT_SCHEDULE", "scheduling attempt %1 of %2 in %3 milliseconds",
7476
"MYSQL_LB_DB_RECONNECT_FAILED", "maximum number of database reconnect attempts: %1, has been exhausted without success",
75-
"MYSQL_LB_DEINIT_OK", "unloading MySQL LB hooks library successful",
7677
"MYSQL_LB_DELETED_EXPIRED_RECLAIMED", "deleted %1 reclaimed leases from the database",
7778
"MYSQL_LB_DELETE_ADDR4", "deleting lease for address %1",
7879
"MYSQL_LB_DELETE_ADDR6", "deleting lease for address %1",
@@ -103,7 +104,6 @@ const char* values[] = {
103104
"MYSQL_LB_GET_SUBID_HWADDR", "obtaining IPv4 lease for subnet ID %1 and hardware address %2",
104105
"MYSQL_LB_GET_SUBID_PAGE6", "obtaining at most %1 IPv6 leases starting from address %2 for subnet ID %3",
105106
"MYSQL_LB_GET_VERSION", "obtaining schema version information",
106-
"MYSQL_LB_INIT_OK", "loading MySQL LB hooks library successful",
107107
"MYSQL_LB_NEGATIVE_LEASES_STAT", "recount of leases returned a negative value",
108108
"MYSQL_LB_NO_TLS", "TLS was required but is not used",
109109
"MYSQL_LB_ROLLBACK", "rolling back MySQL database",

‎src/hooks/dhcp/mysql/mysql_lb_messages.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
namespace isc {
99
namespace dhcp {
1010

11+
extern const isc::log::MessageID MYSQL_DEINIT_OK;
12+
extern const isc::log::MessageID MYSQL_INIT_OK;
1113
extern const isc::log::MessageID MYSQL_LB_ADD_ADDR4;
1214
extern const isc::log::MessageID MYSQL_LB_ADD_ADDR6;
1315
extern const isc::log::MessageID MYSQL_LB_COMMIT;
1416
extern const isc::log::MessageID MYSQL_LB_DB;
1517
extern const isc::log::MessageID MYSQL_LB_DB_RECONNECT_ATTEMPT_FAILED;
1618
extern const isc::log::MessageID MYSQL_LB_DB_RECONNECT_ATTEMPT_SCHEDULE;
1719
extern const isc::log::MessageID MYSQL_LB_DB_RECONNECT_FAILED;
18-
extern const isc::log::MessageID MYSQL_LB_DEINIT_OK;
1920
extern const isc::log::MessageID MYSQL_LB_DELETED_EXPIRED_RECLAIMED;
2021
extern const isc::log::MessageID MYSQL_LB_DELETE_ADDR4;
2122
extern const isc::log::MessageID MYSQL_LB_DELETE_ADDR6;
@@ -46,7 +47,6 @@ extern const isc::log::MessageID MYSQL_LB_GET_SUBID_CLIENTID;
4647
extern const isc::log::MessageID MYSQL_LB_GET_SUBID_HWADDR;
4748
extern const isc::log::MessageID MYSQL_LB_GET_SUBID_PAGE6;
4849
extern const isc::log::MessageID MYSQL_LB_GET_VERSION;
49-
extern const isc::log::MessageID MYSQL_LB_INIT_OK;
5050
extern const isc::log::MessageID MYSQL_LB_NEGATIVE_LEASES_STAT;
5151
extern const isc::log::MessageID MYSQL_LB_NO_TLS;
5252
extern const isc::log::MessageID MYSQL_LB_ROLLBACK;

‎src/hooks/dhcp/mysql/mysql_lb_messages.mes

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ V6) is about to open a MySQL lease database. The parameters of the
1212
connection including database name and username needed to access it
1313
(but not the password if any) are logged.
1414

15-
% MYSQL_LB_DEINIT_OK unloading MySQL LB hooks library successful
16-
This informational message indicates that the MySQL Lease Backend hooks
15+
% MYSQL_DEINIT_OK unloading MySQL hooks library successful
16+
This informational message indicates that the MySQL Backend hooks
1717
library has been unloaded successfully.
1818

19-
% MYSQL_LB_INIT_OK loading MySQL LB hooks library successful
20-
This informational message indicates that the MySQL Lease Backend hooks
19+
% MYSQL_INIT_OK loading MySQL hooks library successful
20+
This informational message indicates that the MySQL Backend hooks
2121
library has been loaded successfully. Enjoy!
2222

2323
% MYSQL_LB_ADD_ADDR4 adding IPv4 lease with address %1

‎src/hooks/dhcp/pgsql/pgsql_callouts.cc

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,19 @@ int load(LibraryHandle& /* handle */) {
6262
// Register PostgreSQL CB factories with CB Managers
6363
PgSqlConfigBackendDHCPv4::registerBackendType();
6464
PgSqlConfigBackendDHCPv6::registerBackendType();
65-
LOG_INFO(pgsql_cb_logger, PGSQL_CB_INIT_OK);
6665

6766
// Register PostgreSQL HB factories with Host Managers
6867
HostDataSourceFactory::registerFactory("postgresql",
6968
PgSqlHostDataSource::factory,
7069
true,
7170
PgSqlHostDataSource::getDBVersion);
72-
LOG_INFO(pgsql_hb_logger, PGSQL_HB_INIT_OK);
7371

7472
// Register PostgreSQL LB factories with Lease Managers
7573
LeaseMgrFactory::registerFactory("postgresql",
7674
PgSqlLeaseMgr::factory,
7775
true,
7876
PgSqlLeaseMgr::getDBVersion);
79-
LOG_INFO(pgsql_lb_logger, PGSQL_LB_INIT_OK);
77+
LOG_INFO(pgsql_lb_logger, PGSQL_INIT_OK);
8078
return (0);
8179
}
8280

@@ -117,15 +115,13 @@ int unload() {
117115
io_service->stopAndPoll();
118116
PgSqlConfigBackendImpl::setIOService(IOServicePtr());
119117
}
120-
LOG_INFO(pgsql_cb_logger, PGSQL_CB_DEINIT_OK);
121118

122119
// Unregister the factories and remove PostgreSQL backends
123120
HostDataSourceFactory::deregisterFactory("postgresql", true);
124-
LOG_INFO(pgsql_hb_logger, PGSQL_HB_DEINIT_OK);
125121

126122
// Unregister the factories and remove PostgreSQL backends
127123
LeaseMgrFactory::deregisterFactory("postgresql", true);
128-
LOG_INFO(pgsql_lb_logger, PGSQL_LB_DEINIT_OK);
124+
LOG_INFO(pgsql_lb_logger, PGSQL_DEINIT_OK);
129125
return (0);
130126
}
131127

‎src/hooks/dhcp/pgsql/pgsql_cb_messages.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ extern const isc::log::MessageID PGSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION4 =
2828
extern const isc::log::MessageID PGSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6 = "PGSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6";
2929
extern const isc::log::MessageID PGSQL_CB_CREATE_UPDATE_SUBNET4 = "PGSQL_CB_CREATE_UPDATE_SUBNET4";
3030
extern const isc::log::MessageID PGSQL_CB_CREATE_UPDATE_SUBNET6 = "PGSQL_CB_CREATE_UPDATE_SUBNET6";
31-
extern const isc::log::MessageID PGSQL_CB_DEINIT_OK = "PGSQL_CB_DEINIT_OK";
3231
extern const isc::log::MessageID PGSQL_CB_DELETE_ALL_CLIENT_CLASSES4 = "PGSQL_CB_DELETE_ALL_CLIENT_CLASSES4";
3332
extern const isc::log::MessageID PGSQL_CB_DELETE_ALL_CLIENT_CLASSES4_RESULT = "PGSQL_CB_DELETE_ALL_CLIENT_CLASSES4_RESULT";
3433
extern const isc::log::MessageID PGSQL_CB_DELETE_ALL_CLIENT_CLASSES6 = "PGSQL_CB_DELETE_ALL_CLIENT_CLASSES6";
@@ -185,7 +184,6 @@ extern const isc::log::MessageID PGSQL_CB_GET_SUBNET6_BY_PREFIX = "PGSQL_CB_GET_
185184
extern const isc::log::MessageID PGSQL_CB_GET_SUBNET6_BY_SUBNET_ID = "PGSQL_CB_GET_SUBNET6_BY_SUBNET_ID";
186185
extern const isc::log::MessageID PGSQL_CB_GET_TYPE4 = "PGSQL_CB_GET_TYPE4";
187186
extern const isc::log::MessageID PGSQL_CB_GET_TYPE6 = "PGSQL_CB_GET_TYPE6";
188-
extern const isc::log::MessageID PGSQL_CB_INIT_OK = "PGSQL_CB_INIT_OK";
189187
extern const isc::log::MessageID PGSQL_CB_NO_TLS_SUPPORT = "PGSQL_CB_NO_TLS_SUPPORT";
190188
extern const isc::log::MessageID PGSQL_CB_RECONNECT_ATTEMPT_FAILED4 = "PGSQL_CB_RECONNECT_ATTEMPT_FAILED4";
191189
extern const isc::log::MessageID PGSQL_CB_RECONNECT_ATTEMPT_FAILED6 = "PGSQL_CB_RECONNECT_ATTEMPT_FAILED6";
@@ -226,7 +224,6 @@ const char* values[] = {
226224
"PGSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6", "create or update shared network: %1 option",
227225
"PGSQL_CB_CREATE_UPDATE_SUBNET4", "create or update subnet: %1",
228226
"PGSQL_CB_CREATE_UPDATE_SUBNET6", "create or update subnet: %1",
229-
"PGSQL_CB_DEINIT_OK", "unloading PostgreSQL CB hooks library successful",
230227
"PGSQL_CB_DELETE_ALL_CLIENT_CLASSES4", "delete all client classes",
231228
"PGSQL_CB_DELETE_ALL_CLIENT_CLASSES4_RESULT", "deleted: %1 entries",
232229
"PGSQL_CB_DELETE_ALL_CLIENT_CLASSES6", "delete all client classes",
@@ -383,7 +380,6 @@ const char* values[] = {
383380
"PGSQL_CB_GET_SUBNET6_BY_SUBNET_ID", "retrieving subnet by subnet id: %1",
384381
"PGSQL_CB_GET_TYPE4", "get type",
385382
"PGSQL_CB_GET_TYPE6", "get type",
386-
"PGSQL_CB_INIT_OK", "loading PostgreSQL CB hooks library successful",
387383
"PGSQL_CB_NO_TLS_SUPPORT", "Attempt to configure TLS (unsupported for PostgreSQL): %1",
388384
"PGSQL_CB_RECONNECT_ATTEMPT_FAILED4", "database reconnect failed: %1",
389385
"PGSQL_CB_RECONNECT_ATTEMPT_FAILED6", "database reconnect failed: %1",

‎src/hooks/dhcp/pgsql/pgsql_cb_messages.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ extern const isc::log::MessageID PGSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION4;
2929
extern const isc::log::MessageID PGSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6;
3030
extern const isc::log::MessageID PGSQL_CB_CREATE_UPDATE_SUBNET4;
3131
extern const isc::log::MessageID PGSQL_CB_CREATE_UPDATE_SUBNET6;
32-
extern const isc::log::MessageID PGSQL_CB_DEINIT_OK;
3332
extern const isc::log::MessageID PGSQL_CB_DELETE_ALL_CLIENT_CLASSES4;
3433
extern const isc::log::MessageID PGSQL_CB_DELETE_ALL_CLIENT_CLASSES4_RESULT;
3534
extern const isc::log::MessageID PGSQL_CB_DELETE_ALL_CLIENT_CLASSES6;
@@ -186,7 +185,6 @@ extern const isc::log::MessageID PGSQL_CB_GET_SUBNET6_BY_PREFIX;
186185
extern const isc::log::MessageID PGSQL_CB_GET_SUBNET6_BY_SUBNET_ID;
187186
extern const isc::log::MessageID PGSQL_CB_GET_TYPE4;
188187
extern const isc::log::MessageID PGSQL_CB_GET_TYPE6;
189-
extern const isc::log::MessageID PGSQL_CB_INIT_OK;
190188
extern const isc::log::MessageID PGSQL_CB_NO_TLS_SUPPORT;
191189
extern const isc::log::MessageID PGSQL_CB_RECONNECT_ATTEMPT_FAILED4;
192190
extern const isc::log::MessageID PGSQL_CB_RECONNECT_ATTEMPT_FAILED6;

0 commit comments

Comments
 (0)