mirror of
https://github.com/postgres/postgres.git
synced 2025-12-21 05:21:08 +03:00
Commit to match discussed elog() changes. Only update is that LOG is
now just below FATAL in server_min_messages. Added more text to
highlight ordering difference between it and client_min_messages.
---------------------------------------------------------------------------
REALLYFATAL => PANIC
STOP => PANIC
New INFO level the prints to client by default
New LOG level the prints to server log by default
Cause VACUUM information to print only to the client
NOTICE => INFO where purely information messages are sent
DEBUG => LOG for purely server status messages
DEBUG removed, kept as backward compatible
DEBUG5, DEBUG4, DEBUG3, DEBUG2, DEBUG1 added
DebugLvl removed in favor of new DEBUG[1-5] symbols
New server_min_messages GUC parameter with values:
DEBUG[5-1], INFO, NOTICE, ERROR, LOG, FATAL, PANIC
New client_min_messages GUC parameter with values:
DEBUG[5-1], LOG, INFO, NOTICE, ERROR, FATAL, PANIC
Server startup now logged with LOG instead of DEBUG
Remove debug_level GUC parameter
elog() numbers now start at 10
Add test to print error message if older elog() values are passed to elog()
Bootstrap mode now has a -d that requires an argument, like postmaster
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: elog.h,v 1.30 2001/11/05 17:46:36 momjian Exp $
|
||||
* $Id: elog.h,v 1.31 2002/03/02 21:39:35 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -15,15 +15,25 @@
|
||||
#define ELOG_H
|
||||
|
||||
/* Error level codes */
|
||||
#define NOTICE 0 /* random info, sent to frontend */
|
||||
#define ERROR (-1) /* user error - return to known state */
|
||||
#define FATAL 1 /* fatal error - abort process */
|
||||
#define REALLYFATAL 2 /* take down the other backends with me */
|
||||
#define DEBUG (-2) /* debug message */
|
||||
#define DEBUG5 10 /* sent only to server logs, label DEBUG */
|
||||
#define DEBUG4 11 /* logs in decreasing detail */
|
||||
#define DEBUG3 12
|
||||
#define DEBUG2 13
|
||||
#define DEBUG1 14
|
||||
#define LOG 15 /* sent only to server logs by default,
|
||||
* label LOG. */
|
||||
#define INFO 16 /* sent only to client by default, for
|
||||
* informative messages that are part of
|
||||
* normal query operation. */
|
||||
#define NOTICE 17 /* sent to client and server by default,
|
||||
* important messages, for unusual cases that
|
||||
* should be reported but are not serious
|
||||
* enough to abort the query. */
|
||||
#define ERROR 18 /* user error - return to known state */
|
||||
#define FATAL 19 /* fatal error - abort process */
|
||||
#define PANIC 20 /* take down the other backends with me */
|
||||
|
||||
/* temporary nonsense... */
|
||||
#define STOP REALLYFATAL
|
||||
#define LOG DEBUG
|
||||
/*#define DEBUG DEBUG5*/ /* Backward compatibility with pre-7.3 */
|
||||
|
||||
/* Configurable parameters */
|
||||
#ifdef ENABLE_SYSLOG
|
||||
@@ -32,6 +42,10 @@ extern int Use_syslog;
|
||||
extern bool Log_timestamp;
|
||||
extern bool Log_pid;
|
||||
|
||||
extern char *server_min_messages_str;
|
||||
extern char *client_min_messages_str;
|
||||
extern const char server_min_messages_str_default[];
|
||||
extern const char client_min_messages_str_default[];
|
||||
|
||||
extern void
|
||||
elog(int lev, const char *fmt,...)
|
||||
@@ -41,4 +55,9 @@ __attribute__((format(printf, 2, 3)));
|
||||
|
||||
extern int DebugFileOpen(void);
|
||||
|
||||
extern bool check_server_min_messages(const char *lev);
|
||||
extern void assign_server_min_messages(const char *lev);
|
||||
extern bool check_client_min_messages(const char *lev);
|
||||
extern void assign_client_min_messages(const char *lev);
|
||||
|
||||
#endif /* ELOG_H */
|
||||
|
||||
Reference in New Issue
Block a user