database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-14 18:42:34 +03:00
Code Activity

Have log_duration only output when log_statement has printed the query.

Browse Source 
This handles the new multiple log_statement values.

Ed L.
This commit is contained in:
Bruce Momjian
2004-10-15 16:50:31 +00:00
parent c96c02c7af
commit a1ce88a59c
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/backend/tcop/postgres.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.435 2004/10/12 21:54:40 petere Exp $
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.436 2004/10/15 16:50:31 momjian Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@ -81,6 +81,9 @@ bool Log_disconnections = false;
LogStmtLevel log_statement = LOGSTMT_NONE;
/* flag indicating if the statement satisfies log_statement */
bool statement_logged;
/* GUC variable for maximum stack depth (measured in kilobytes) */
int max_stack_depth = 2048;
@ -463,9 +466,13 @@ pg_parse_query(const char *query_string)
List *raw_parsetree_list;
ListCell *parsetree_item;
statement_logged = false;
if (log_statement == LOGSTMT_ALL)
{
ereport(LOG,
(errmsg("statement: %s", query_string)));
statement_logged = true;
}
if (log_parser_stats)
ResetUsage();
@ -501,6 +508,7 @@ pg_parse_query(const char *query_string)
{
ereport(LOG,
(errmsg("statement: %s", query_string)));
statement_logged = true;
break;
}
commandTag = CreateCommandTag(parsetree);
@ -512,6 +520,7 @@ pg_parse_query(const char *query_string)
{
ereport(LOG,
(errmsg("statement: %s", query_string)));
statement_logged = true;
break;
}
}
@ -1003,7 +1012,8 @@ exec_simple_query(const char *query_string)
}
usecs = (long) (stop_t.tv_sec - start_t.tv_sec) * 1000000 + (long) (stop_t.tv_usec - start_t.tv_usec);
if (save_log_duration)
/* Only print duration if we previously printed the statement. */
if (statement_logged && save_log_duration)
ereport(LOG,
(errmsg("duration: %ld.%03ld ms",
(long) ((stop_t.tv_sec - start_t.tv_sec) * 1000 +