From 0937bf9544c8c3951de09702ba3a109c6b784552 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 14 Nov 2000 19:13:27 +0000 Subject: [PATCH] Small polishing of syslog facility and ident settings. Only allow setting at postmaster start, rename syslog_progid to syslog_ident, since syslog itself uses that term, fix doc markup. --- doc/src/sgml/runtime.sgml | 23 +++++++++++++---------- src/backend/utils/error/elog.c | 8 ++++---- src/backend/utils/misc/guc.c | 26 +++++++++++++++----------- 3 files changed, 32 insertions(+), 25 deletions(-) diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml index f7eff6da82..a8117cafa0 100644 --- a/doc/src/sgml/runtime.sgml +++ b/doc/src/sgml/runtime.sgml @@ -1,5 +1,5 @@ @@ -825,22 +825,25 @@ env PGOPTIONS='-c geqo=off' psql SYSLOG_FACILITY (string) - If the SYSLOG option is set to 1 or greater, this option determines - the syslog facility used. You may choose - from LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. - the default is LOCAL0 + This option determines the syslog + facility to be used when syslog is enabled. + You may choose from LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, + LOCAL5, LOCAL6, LOCAL7; the default is LOCAL0. See also the + documentation of your system's + syslog. - SYSLOG_PROGID (string) + SYSLOG_IDENT (string) - If the SYSLOG option is set to 1 or greater, this option determines - the program id used to identify PostgreSQL messages - in syslog log messages. The default is - postgres. + If logging to syslog is enabled, this option determines the + program name used to identify + PostgreSQL messages in + syslog log messages. The default + is postgres. diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 89aeacb5ff..52020544c3 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.66 2000/11/13 21:35:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.67 2000/11/14 19:13:27 petere Exp $ * *------------------------------------------------------------------------- */ @@ -58,8 +58,8 @@ extern CommandDest whereToSendOutput; * ... in theory anyway */ int Use_syslog = 0; -char *Syslog_facility = "LOCAL0"; -char *Syslog_progid = "postgres"; +char *Syslog_facility; +char *Syslog_ident; static void write_syslog(int level, const char *line); @@ -646,7 +646,7 @@ write_syslog(int level, const char *line) syslog_fac = LOG_LOCAL6; if (strcasecmp(Syslog_facility,"LOCAL7") == 0) syslog_fac = LOG_LOCAL7; - openlog(Syslog_progid, LOG_PID | LOG_NDELAY, syslog_fac); + openlog(Syslog_ident, LOG_PID | LOG_NDELAY, syslog_fac); openlog_done = true; } diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 1ce8186b7c..8598051c6c 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -4,7 +4,7 @@ * Support for grand unified configuration scheme, including SET * command, configuration file, and command line options. * - * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.19 2000/11/14 01:15:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.20 2000/11/14 19:13:27 petere Exp $ * * Copyright 2000 by PostgreSQL Global Development Group * Written by Peter Eisentraut . @@ -41,8 +41,8 @@ extern int XLOGbuffers; extern int XLOG_DEBUG; #ifdef ENABLE_SYSLOG extern char *Syslog_facility; -extern char *Syslog_progid; - bool check_facility(const char *facility); +extern char *Syslog_ident; +bool check_facility(const char *facility); #endif /* @@ -308,10 +308,11 @@ ConfigureNamesString[] = {"unix_socket_group", PGC_POSTMASTER, &Unix_socket_group, "", NULL}, + #ifdef ENABLE_SYSLOG - {"syslog_facility", PGC_SIGHUP, &Syslog_facility, + {"syslog_facility", PGC_POSTMASTER, &Syslog_facility, "LOCAL0", check_facility}, - {"syslog_progid", PGC_SIGHUP, &Syslog_progid, + {"syslog_ident", PGC_POSTMASTER, &Syslog_ident, "postgres", NULL}, #endif @@ -608,7 +609,7 @@ set_config_option(const char * name, const char * value, GucContext bool boolval; if (!parse_bool(value, &boolval)) { - elog(elevel, "Option '%s' requires a boolean value", name); + elog(elevel, "option '%s' requires a boolean value", name); return false; } if (DoIt) @@ -629,12 +630,12 @@ set_config_option(const char * name, const char * value, GucContext if (!parse_int(value, &intval)) { - elog(elevel, "Option '%s' expects an integer value", name); + elog(elevel, "option '%s' expects an integer value", name); return false; } if (intval < conf->min || intval > conf->max) { - elog(elevel, "Option '%s' value %d is outside" + elog(elevel, "option '%s' value %d is outside" " of permissible range [%d .. %d]", name, intval, conf->min, conf->max); return false; @@ -657,12 +658,12 @@ set_config_option(const char * name, const char * value, GucContext if (!parse_real(value, &dval)) { - elog(elevel, "Option '%s' expects a real number", name); + elog(elevel, "option '%s' expects a real number", name); return false; } if (dval < conf->min || dval > conf->max) { - elog(elevel, "Option '%s' value %g is outside" + elog(elevel, "option '%s' value %g is outside" " of permissible range [%g .. %g]", name, dval, conf->min, conf->max); return false; @@ -683,7 +684,7 @@ set_config_option(const char * name, const char * value, GucContext { if (conf->parse_hook && !(conf->parse_hook)(value)) { - elog(elevel, "Option '%s' rejects value '%s'", name, value); + elog(elevel, "invalid value for option '%s': '%s'", name, value); return false; } if (DoIt) @@ -824,6 +825,9 @@ ParseLongOption(const char * string, char ** name, char ** value) if (*cp == '-') *cp = '_'; } + + + #ifdef ENABLE_SYSLOG bool check_facility(const char *facility) -- 2.40.0