diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c index e6899c6..c60f790 100644 --- a/src/backend/postmaster/syslogger.c +++ b/src/backend/postmaster/syslogger.c @@ -45,6 +45,7 @@ #include "storage/latch.h" #include "storage/pg_shmem.h" #include "utils/guc.h" +#include "utils/guc_values.h" #include "utils/ps_status.h" #include "utils/timestamp.h" @@ -1383,7 +1384,7 @@ update_metainfo_datafile(void) if (last_file_name && (Log_destination & LOG_DESTINATION_STDERR)) { - if (fprintf(fh, "stderr %s\n", last_file_name) < 0) + if (fprintf(fh, GUCV_STDERR " %s\n", last_file_name) < 0) { ereport(LOG, (errcode_for_file_access(), @@ -1396,7 +1397,7 @@ update_metainfo_datafile(void) if (last_csv_file_name && (Log_destination & LOG_DESTINATION_CSVLOG)) { - if (fprintf(fh, "csvlog %s\n", last_csv_file_name) < 0) + if (fprintf(fh, GUCV_CSVLOG " %s\n", last_csv_file_name) < 0) { ereport(LOG, (errcode_for_file_access(), diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c index a40b27d..886e038 100644 --- a/src/backend/utils/adt/misc.c +++ b/src/backend/utils/adt/misc.c @@ -42,6 +42,7 @@ #include "tcop/tcopprot.h" #include "utils/acl.h" #include "utils/builtins.h" +#include "utils/guc_values.h" #include "utils/timestamp.h" #define atooid(x) ((Oid) strtoul((x), NULL, 10)) @@ -914,12 +915,13 @@ pg_current_logfile(PG_FUNCTION_ARGS) { logfmt = text_to_cstring(PG_GETARG_TEXT_PP(0)); - if (strcmp(logfmt, "stderr") != 0 && strcmp(logfmt, "csvlog") != 0) + if (strcmp(logfmt, GUCV_STDERR) != 0 && + strcmp(logfmt, GUCV_CSVLOG) != 0) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), errmsg("log format \"%s\" is not supported", logfmt), - errhint("The supported log formats are \"stderr\"" - " and \"csvlog\"."))); + errhint("The supported log formats are \"" GUCV_STDERR + "\" and \"" GUCV_CSVLOG "\"."))); } fd = AllocateFile(LOG_METAINFO_DATAFILE, "r");