Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
001d5a7a
G
Gpdb
项目概览
Greenplum
/
Gpdb
通知
7
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
Gpdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
001d5a7a
编写于
11月 14, 2002
作者:
B
Bruce Momjian
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename server_min_messages to log_min_messages. Part of consolidation
of log_ settings.
上级
3e8c4c7a
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
61 addition
and
60 deletion
+61
-60
doc/src/sgml/plpgsql.sgml
doc/src/sgml/plpgsql.sgml
+2
-2
doc/src/sgml/runtime.sgml
doc/src/sgml/runtime.sgml
+29
-28
src/backend/bootstrap/bootstrap.c
src/backend/bootstrap/bootstrap.c
+2
-2
src/backend/postmaster/postmaster.c
src/backend/postmaster/postmaster.c
+2
-2
src/backend/tcop/postgres.c
src/backend/tcop/postgres.c
+5
-5
src/backend/utils/error/elog.c
src/backend/utils/error/elog.c
+5
-5
src/backend/utils/misc/guc.c
src/backend/utils/misc/guc.c
+8
-8
src/backend/utils/misc/postgresql.conf.sample
src/backend/utils/misc/postgresql.conf.sample
+1
-1
src/bin/psql/tab-complete.c
src/bin/psql/tab-complete.c
+2
-2
src/include/utils/guc.h
src/include/utils/guc.h
+5
-5
未找到文件。
doc/src/sgml/plpgsql.sgml
浏览文件 @
001d5a7a
<
!--
$
Header
:
/
cvsroot
/
pgsql
/
doc
/
src
/
sgml
/
plpgsql
.
sgml
,
v
1.
9
2002
/
11
/
10
00
:
35
:
58
momjian
Exp
$
$
Header
:
/
cvsroot
/
pgsql
/
doc
/
src
/
sgml
/
plpgsql
.
sgml
,
v
1.
10
2002
/
11
/
14
23
:
53
:
26
momjian
Exp
$
-->
<
chapter
id
=
"plpgsql"
>
...
...
@@ -1900,7 +1900,7 @@ RAISE <replaceable class="parameter">level</replaceable> '<replaceable class="pa
(
raise
an
error
and
abort
the
current
transaction
).
Whether
error
messages
of
a
particular
priority
are
reported
to
the
client
,
written
to
the
server
log
,
or
both
is
controlled
by
the
<
option
>
SERVER
_MIN_MESSAGES
</
option
>
and
<
option
>
LOG
_MIN_MESSAGES
</
option
>
and
<
option
>
CLIENT_MIN_MESSAGES
</
option
>
configuration
variables
.
See
the
<
citetitle
>
PostgreSQL
Administrator
's Guide</citetitle> for more
information.
...
...
doc/src/sgml/runtime.sgml
浏览文件 @
001d5a7a
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.15
0 2002/11/11 20:14:03 petere
Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.15
1 2002/11/14 23:53:26 momjian
Exp $
-->
<Chapter Id="runtime">
...
...
@@ -854,18 +854,17 @@ env PGOPTIONS='-c geqo=off' psql
<para>
<variablelist>
<varlistentry>
<term><varname>
SERVER
_MIN_MESSAGES</varname> (<type>string</type>)</term>
<term><varname>
CLIENT
_MIN_MESSAGES</varname> (<type>string</type>)</term>
<listitem>
<para>
This controls how much message detail is written to the
server
logs
. Valid values are <literal>DEBUG5</>,
This controls how much message detail is written to the
client
. Valid values are <literal>DEBUG5</>,
<literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
<literal>DEBUG1</>, <literal>INFO</>, <literal>NOTICE</>,
<literal>WARNING</>, <literal>ERROR</>, <literal>LOG</>,
<literal>FATAL</>, and <literal>PANIC</>. Later values send
less detail to the logs. The default is <literal>NOTICE</>.
Note that <literal>LOG</> has a different precedence here than
in <literal>CLIENT_MIN_MESSAGES</>.
<literal>DEBUG1</>, <literal>LOG</>, <literal>NOTICE</>,
<literal>WARNING</>, and <literal>ERROR</>. Later values send
less information to the client. The default is
<literal>NOTICE</>. Note that <literal>LOG</> has a different
precedence here than in <literal>LOG_MIN_MESSAGES</>.
</para>
<para>
...
...
@@ -952,23 +951,6 @@ env PGOPTIONS='-c geqo=off' psql
</listitem>
</varlistentry>
<varlistentry>
<term><varname>CLIENT_MIN_MESSAGES</varname> (<type>string</type>)</term>
<listitem>
<para>
This controls how much message detail is written to the
client. Valid values are <literal>DEBUG5</>,
<literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
<literal>DEBUG1</>, <literal>LOG</>, <literal>NOTICE</>,
<literal>WARNING</>, and <literal>ERROR</>. Later values send
less information to the client. The default is
<literal>NOTICE</>. Note that <literal>LOG</> has a different
precedence here than in <literal>SERVER_MIN_MESSAGES</>. Also
see that section for an explanation of the various values.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>DEBUG_ASSERTIONS</varname> (<type>boolean</type>)</term>
<listitem>
...
...
@@ -1076,6 +1058,25 @@ env PGOPTIONS='-c geqo=off' psql
</listitem>
</varlistentry>
<varlistentry>
<term><varname>LOG_MIN_MESSAGES</varname> (<type>string</type>)</term>
<listitem>
<para>
This controls how much message detail is written to the server
logs. Valid values are <literal>DEBUG5</>,
<literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
<literal>DEBUG1</>, <literal>INFO</>, <literal>NOTICE</>,
<literal>WARNING</>, <literal>ERROR</>, <literal>LOG</>,
<literal>FATAL</>, and <literal>PANIC</>. Later values send
less detail to the logs. The default is <literal>NOTICE</>.
Note that <literal>LOG</> has a different precedence here than
in <literal>CLIENT_MIN_MESSAGES</>. Also see that section
for an explanation of the various values.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>LOG_PID</varname> (<type>boolean</type>)</term>
<listitem>
...
...
@@ -2177,7 +2178,7 @@ dynamic_library_path = '/usr/local/lib/postgresql:/home/my_project/lib:$libdir'
</row>
<row>
<entry><option>-d <replaceable>x</replaceable></option></entry>
<entry><literal>
server
_min_messages = DEBUG<replaceable>x</replaceable></></entry>
<entry><literal>
log
_min_messages = DEBUG<replaceable>x</replaceable></></entry>
</row>
<row>
<entry><option>-F</option></entry>
...
...
src/backend/bootstrap/bootstrap.c
浏览文件 @
001d5a7a
...
...
@@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.14
4 2002/09/26 22:58:33 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.14
5 2002/11/14 23:53:27 momjian
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -263,7 +263,7 @@ BootstrapMain(int argc, char *argv[])
char
*
debugstr
=
palloc
(
strlen
(
"debug"
)
+
strlen
(
optarg
)
+
1
);
sprintf
(
debugstr
,
"debug%s"
,
optarg
);
SetConfigOption
(
"
server
_min_messages"
,
debugstr
,
SetConfigOption
(
"
log
_min_messages"
,
debugstr
,
PGC_POSTMASTER
,
PGC_S_ARGV
);
SetConfigOption
(
"client_min_messages"
,
debugstr
,
PGC_POSTMASTER
,
PGC_S_ARGV
);
...
...
src/backend/postmaster/postmaster.c
浏览文件 @
001d5a7a
...
...
@@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.29
3 2002/11/13 00:39:4
7 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.29
4 2002/11/14 23:53:2
7 momjian Exp $
*
* NOTES
*
...
...
@@ -451,7 +451,7 @@ PostmasterMain(int argc, char *argv[])
char
*
debugstr
=
palloc
(
strlen
(
"debug"
)
+
strlen
(
optarg
)
+
1
);
sprintf
(
debugstr
,
"debug%s"
,
optarg
);
SetConfigOption
(
"
server
_min_messages"
,
debugstr
,
SetConfigOption
(
"
log
_min_messages"
,
debugstr
,
PGC_POSTMASTER
,
PGC_S_ARGV
);
pfree
(
debugstr
);
debug_flag
=
atoi
(
optarg
);
...
...
src/backend/tcop/postgres.c
浏览文件 @
001d5a7a
...
...
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.30
7 2002/10/31 21:34:16 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.30
8 2002/11/14 23:53:27 momjian
Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
...
...
@@ -1339,7 +1339,7 @@ PostgresMain(int argc, char *argv[], const char *username)
char
*
debugstr
=
palloc
(
strlen
(
"debug"
)
+
strlen
(
optarg
)
+
1
);
sprintf
(
debugstr
,
"debug%s"
,
optarg
);
SetConfigOption
(
"
server
_min_messages"
,
debugstr
,
ctx
,
gucsource
);
SetConfigOption
(
"
log
_min_messages"
,
debugstr
,
ctx
,
gucsource
);
pfree
(
debugstr
);
}
...
...
@@ -1349,7 +1349,7 @@ PostgresMain(int argc, char *argv[], const char *username)
* from propagating to backend. It would be nice
* to set it to the postgresql.conf value here.
*/
SetConfigOption
(
"
server
_min_messages"
,
"notice"
,
SetConfigOption
(
"
log
_min_messages"
,
"notice"
,
ctx
,
gucsource
);
}
break
;
...
...
@@ -1590,7 +1590,7 @@ PostgresMain(int argc, char *argv[], const char *username)
/*
* -d is not the same as setting
*
server
_min_messages because it enables other
*
log
_min_messages because it enables other
* output options.
*/
if
(
debug_flag
>=
1
)
...
...
@@ -1781,7 +1781,7 @@ PostgresMain(int argc, char *argv[], const char *username)
if
(
!
IsUnderPostmaster
)
{
puts
(
"
\n
POSTGRES backend interactive interface "
);
puts
(
"$Revision: 1.30
7 $ $Date: 2002/10/31 21:34:16
$
\n
"
);
puts
(
"$Revision: 1.30
8 $ $Date: 2002/11/14 23:53:27
$
\n
"
);
}
/*
...
...
src/backend/utils/error/elog.c
浏览文件 @
001d5a7a
...
...
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.10
4 2002/11/01 17:55:23 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.10
5 2002/11/14 23:53:27 momjian
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -148,21 +148,21 @@ elog(int lev, const char *fmt,...)
/* Complicated because LOG is sorted out-of-order for this purpose */
if
(
lev
==
LOG
||
lev
==
COMMERROR
)
{
if
(
server
_min_messages
==
LOG
)
if
(
log
_min_messages
==
LOG
)
output_to_server
=
true
;
else
if
(
server
_min_messages
<
FATAL
)
else
if
(
log
_min_messages
<
FATAL
)
output_to_server
=
true
;
}
else
{
/* lev != LOG */
if
(
server
_min_messages
==
LOG
)
if
(
log
_min_messages
==
LOG
)
{
if
(
lev
>=
FATAL
)
output_to_server
=
true
;
}
/* Neither is LOG */
else
if
(
lev
>=
server
_min_messages
)
else
if
(
lev
>=
log
_min_messages
)
output_to_server
=
true
;
}
...
...
src/backend/utils/misc/guc.c
浏览文件 @
001d5a7a
...
...
@@ -5,7 +5,7 @@
* command, configuration file, and command line options.
* See src/backend/utils/misc/README for more information.
*
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.10
0 2002/11/08 17:37:52 tgl
Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.10
1 2002/11/14 23:53:27 momjian
Exp $
*
* Copyright 2000 by PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>.
...
...
@@ -105,9 +105,9 @@ int log_min_error_statement = ERROR;
char
*
log_min_error_statement_str
=
NULL
;
const
char
log_min_error_statement_str_default
[]
=
"panic"
;
int
server
_min_messages
=
NOTICE
;
char
*
server
_min_messages_str
=
NULL
;
const
char
server
_min_messages_str_default
[]
=
"notice"
;
int
log
_min_messages
=
NOTICE
;
char
*
log
_min_messages_str
=
NULL
;
const
char
log
_min_messages_str_default
[]
=
"notice"
;
int
client_min_messages
=
NOTICE
;
char
*
client_min_messages_str
=
NULL
;
...
...
@@ -805,8 +805,8 @@ static struct config_string
},
{
{
"
server_min_messages"
,
PGC_USERSET
},
&
server
_min_messages_str
,
server_min_messages_str_default
,
assign_server
_min_messages
,
NULL
{
"
log_min_messages"
,
PGC_USERSET
},
&
log
_min_messages_str
,
log_min_messages_str_default
,
assign_log
_min_messages
,
NULL
},
{
...
...
@@ -2927,10 +2927,10 @@ GUCArrayDelete(ArrayType *array, const char *name)
}
const
char
*
assign_
server
_min_messages
(
const
char
*
newval
,
assign_
log
_min_messages
(
const
char
*
newval
,
bool
doit
,
bool
interactive
)
{
return
(
assign_msglvl
(
&
server
_min_messages
,
newval
,
doit
,
interactive
));
return
(
assign_msglvl
(
&
log
_min_messages
,
newval
,
doit
,
interactive
));
}
const
char
*
...
...
src/backend/utils/misc/postgresql.conf.sample
浏览文件 @
001d5a7a
...
...
@@ -112,7 +112,7 @@
#
# Message display
#
#
server
_min_messages = notice # Values, in order of decreasing detail:
#
log
_min_messages = notice # Values, in order of decreasing detail:
# debug5, debug4, debug3, debug2, debug1,
# info, notice, warning, error, log, fatal,
# panic
...
...
src/bin/psql/tab-complete.c
浏览文件 @
001d5a7a
...
...
@@ -3,7 +3,7 @@
*
* Copyright 2000-2002 by PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.6
5 2002/11/08 17:37:52 tgl
Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.6
6 2002/11/14 23:53:27 momjian
Exp $
*/
/*----------------------------------------------------------------------
...
...
@@ -229,7 +229,7 @@ psql_completion(char *text, int start, int end)
"enable_hashjoin"
,
"geqo"
,
"fsync"
,
"
server
_min_messages"
,
"
log
_min_messages"
,
"client_min_messages"
,
"debug_assertions"
,
"log_statement"
,
...
...
src/include/utils/guc.h
浏览文件 @
001d5a7a
...
...
@@ -4,7 +4,7 @@
* External declarations pertaining to backend/utils/misc/guc.c and
* backend/utils/misc/guc-file.l
*
* $Id: guc.h,v 1.2
4 2002/10/21 18:57:35 petere
Exp $
* $Id: guc.h,v 1.2
5 2002/11/14 23:53:27 momjian
Exp $
*/
#ifndef GUC_H
#define GUC_H
...
...
@@ -103,7 +103,7 @@ extern ArrayType *GUCArrayDelete(ArrayType *array, const char *name);
extern
const
char
*
assign_min_error_statement
(
const
char
*
newval
,
bool
doit
,
bool
interactive
);
extern
const
char
*
assign_
server
_min_messages
(
const
char
*
newval
,
extern
const
char
*
assign_
log
_min_messages
(
const
char
*
newval
,
bool
doit
,
bool
interactive
);
extern
const
char
*
assign_client_min_messages
(
const
char
*
newval
,
bool
doit
,
bool
interactive
);
...
...
@@ -129,9 +129,9 @@ extern int log_min_error_statement;
extern
char
*
log_min_error_statement_str
;
extern
const
char
log_min_error_statement_str_default
[];
extern
int
server
_min_messages
;
extern
char
*
server
_min_messages_str
;
extern
const
char
server
_min_messages_str_default
[];
extern
int
log
_min_messages
;
extern
char
*
log
_min_messages_str
;
extern
const
char
log
_min_messages_str_default
[];
extern
int
client_min_messages
;
extern
char
*
client_min_messages_str
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录