diff options
| author | Michael Paquier | 2022-08-05 00:36:42 +0000 |
|---|---|---|
| committer | Michael Paquier | 2022-08-05 00:37:12 +0000 |
| commit | 47ab1ac822cd928bfe43b2c25be102a6a08902f4 (patch) | |
| tree | e78d984e1b6fdfb40ce7984f313089605c4734c0 | |
| parent | 53823a06be6f40d88d8e3ba45045ecee1a21fc5e (diff) | |
Use hba_file/ident_file GUCs rather than pg_hba.conf/pg_ident.conf in logs
This is particularly useful when log_min_messages is set to FATAL, so as
one can know which file was not getting loaded whether hba_file or
ident_file are set to some non-default values. If using the default
values of these GUC parameters, the same reports are generated.
This commit changes the load (startup) and reload (SIGHUP) messages.
Author: Julien Rouhaud
Discussion: https://postgr.es/m/20220223045959.35ipdsvbxcstrhya@jrouhaud
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 7 | ||||
| -rw-r--r-- | src/backend/utils/init/postinit.c | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index e541b16bdbe..81cb585891b 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -1419,7 +1419,8 @@ PostmasterMain(int argc, char *argv[]) * since there is no way to connect to the database in this case. */ ereport(FATAL, - (errmsg("could not load pg_hba.conf"))); + /* translator: %s is a configuration file */ + (errmsg("could not load %s", HbaFileName))); } if (!load_ident()) { @@ -2769,11 +2770,11 @@ SIGHUP_handler(SIGNAL_ARGS) if (!load_hba()) ereport(LOG, /* translator: %s is a configuration file */ - (errmsg("%s was not reloaded", "pg_hba.conf"))); + (errmsg("%s was not reloaded", HbaFileName))); if (!load_ident()) ereport(LOG, - (errmsg("%s was not reloaded", "pg_ident.conf"))); + (errmsg("%s was not reloaded", IdentFileName))); #ifdef USE_SSL /* Reload SSL configuration as well */ diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 29f70accb22..0d557a8684b 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -217,7 +217,8 @@ PerformAuthentication(Port *port) * since there is no way to connect to the database in this case. */ ereport(FATAL, - (errmsg("could not load pg_hba.conf"))); + /* translator: %s is a configuration file */ + (errmsg("could not load %s", HbaFileName))); } if (!load_ident()) |