Skip to content

Commit ade0fe5

Browse files
bmomjianbmomjian
committed
Update docs for new stored procedure error levels.
1 parent 7d5edf2 commit ade0fe5

File tree

3 files changed

+28
-26
lines changed

3 files changed

+28
-26
lines changed

‎doc/src/sgml/plperl.sgml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/plperl.sgml,v 2.15 2002/01/25 19:13:15 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/plperl.sgml,v 2.16 2002/03/06 19:05:57 momjian Exp $
33
-->
44

55
<chapter id="plperl">
@@ -278,13 +278,12 @@ CREATE FUNCTION badfunc() RETURNS integer AS '
278278
<term><function>elog</> <replaceable>level</replaceable>, <replaceable>msg</replaceable></term>
279279
<listitem>
280280
<para>
281-
Emit a log or error message. Possible levels are <literal>DEBUG</>,
282-
<literal>NOTICE</>, and <literal>ERROR</>.
283-
<literal>DEBUG</> and <literal>NOTICE</> simply emit the given message
284-
into the postmaster log (and send it to the client too, in the case of
285-
<literal>NOTICE</>). <literal>ERROR</> raises an error condition:
286-
further execution of the function is abandoned, and the current
287-
transaction is aborted.
281+
Emit a log or error message. Possible levels are
282+
<literal>DEBUG</>, <literal>LOG</>, <literal>INFO</>,
283+
<literal>NOTICE</>, <literal>WARNING</>, and <literal>ERROR</>.
284+
<literal>ERROR</> raises an error condition: further execution
285+
of the function is abandoned, and the current transaction is
286+
aborted.
288287
</para>
289288
</listitem>
290289
</varlistentry>

‎doc/src/sgml/plpython.sgml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/plpython.sgml,v 1.8 2002/01/07 02:29:13 petere Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/plpython.sgml,v 1.9 2002/03/06 19:05:57 momjian Exp $ -->
22

33
<chapter id="plpython">
44
<title>PL/Python - Python Procedural Language</title>
@@ -150,12 +150,14 @@ def __plpython_procedure_myfunc_23456():
150150
this module are available to you in the Python code as
151151
<literal>plpy.<replaceable>foo</replaceable></literal>. At present
152152
<literal>plpy</literal> implements the functions
153-
<literal>plpy.error("msg")</literal>,
154-
<literal>plpy.fatal("msg")</literal>,
155-
<literal>plpy.debug("msg")</literal>, and
156-
<literal>plpy.notice("msg")</literal>. They are mostly equivalent
157-
to calling <literal>elog(<replaceable>LEVEL</>, "msg")</literal>,
158-
where <replaceable>LEVEL</> is DEBUG, ERROR, FATAL or NOTICE.
153+
<literal>plpy.debug("msg")</literal>,
154+
<literal>plpy.log("msg")</literal>,
155+
<literal>plpy.info("msg")</literal>,
156+
<literal>plpy.notice("msg")</literal>,
157+
<literal>plpy.warning("msg")</literal>,
158+
<literal>plpy.error("msg")</literal>, and
159+
<literal>plpy.fatal("msg")</literal>. They are mostly equivalent
160+
to calling <literal>elog(<replaceable>LEVEL</>, "msg")</literal>.
159161
<function>plpy.error</function> and <function>plpy.fatal</function>
160162
actually raise a Python exception which, if uncaught, causes the
161163
PL/Python module to call <literal>elog(ERROR, msg)</literal> when

‎doc/src/sgml/pltcl.sgml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/pltcl.sgml,v 2.18 2002/01/23 21:08:17 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/pltcl.sgml,v 2.19 2002/03/06 19:05:58 momjian Exp $
33
-->
44

55
<chapter id="pltcl">
@@ -441,16 +441,17 @@ SELECT 'doesn''t' AS ret
441441
<term><function>elog</> <replaceable>level</replaceable> <replaceable>msg</replaceable></term>
442442
<listitem>
443443
<para>
444-
Emit a log or error message. Possible levels are <literal>DEBUG</>,
445-
<literal>NOTICE</>, <literal>ERROR</>, and <literal>FATAL</>.
446-
<literal>DEBUG</> and <literal>NOTICE</> simply emit the given message
447-
into the postmaster log (and send it to the client too, in the case of
448-
<literal>NOTICE</>). <literal>ERROR</> raises an error condition:
449-
further execution of the function is abandoned, and the current
450-
transaction is aborted. <literal>FATAL</> aborts the transaction and
451-
causes the current backend to shut down (there is probably no good
452-
reason to use this error level in PL/Tcl functions, but it's provided
453-
for completeness).
444+
Emit a log or error message. Possible levels are
445+
<literal>DEBUG</>, <literal>LOG</>, <literal>INFO</>,
446+
<literal>NOTICE</>, <literal>WARNING</>, <literal>ERROR</>, and
447+
<literal>FATAL</>. Most simply emit the given message just like
448+
the <literal>elog</> backend C function. <literal>ERROR</>
449+
raises an error condition: further execution of the function is
450+
abandoned, and the current transaction is aborted.
451+
<literal>FATAL</> aborts the transaction and causes the current
452+
backend to shut down (there is probably no good reason to use
453+
this error level in PL/Tcl functions, but it's provided for
454+
completeness).
454455
</para>
455456
</listitem>
456457
</varlistentry>

0 commit comments

Comments
 (0)