mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup for log_disconnections(). Patch from Qingqing Zhou,

Browse Source 
fixes by Neil Conway.
This commit is contained in:
Neil Conway 2005-10-05 23:46:06 +00:00
parent 8c6f345005
commit b5aad11a1b
1 changed files with 13 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.463 2005/09/26 15:51:12 momjian Exp $ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.464 2005/10/05 23:46:06 neilc Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
@ -3532,23 +3532,7 @@ log_disconnections(int code, Datum arg)
minutes, minutes,
seconds; seconds;
char session_time[20];
char uname[6 + NAMEDATALEN];
char dbname[10 + NAMEDATALEN];
char remote_host[7 + NI_MAXHOST];
char remote_port[7 + NI_MAXSERV];
snprintf(uname, sizeof(uname), " user=%s", port->user_name);
snprintf(dbname, sizeof(dbname), " database=%s", port->database_name);
snprintf(remote_host, sizeof(remote_host), " host=%s",
port->remote_host);
if (port->remote_port[0])
snprintf(remote_port, sizeof(remote_port), " port=%s", port->remote_port);
else
remote_port[0] = '\0';
gettimeofday(&end, NULL); gettimeofday(&end, NULL);
if (end.tv_usec < port->session_start.tv_usec) if (end.tv_usec < port->session_start.tv_usec)
{ {
end.tv_sec--; end.tv_sec--;
@ -3557,28 +3541,16 @@ log_disconnections(int code, Datum arg)
end.tv_sec -= port->session_start.tv_sec; end.tv_sec -= port->session_start.tv_sec;
end.tv_usec -= port->session_start.tv_usec; end.tv_usec -= port->session_start.tv_usec;
/* for stricter accuracy here we could round - this is close enough */
hours = end.tv_sec / SECS_PER_HOUR; hours = end.tv_sec / SECS_PER_HOUR;
end.tv_sec %= SECS_PER_HOUR; end.tv_sec %= SECS_PER_HOUR;
minutes = end.tv_sec / SECS_PER_MINUTE; minutes = end.tv_sec / SECS_PER_MINUTE;
seconds = end.tv_sec % SECS_PER_MINUTE; seconds = end.tv_sec % SECS_PER_MINUTE;
/* if time has gone backwards for some reason say so, or print time */ ereport(LOG,
(errmsg("disconnection: session time: %d:%02d:%02d.%02d "
if (end.tv_sec < 0) "user=%s database=%s host=%s%s%s",
snprintf(session_time, sizeof(session_time), "negative!"); hours, minutes, seconds, (int) (end.tv_usec / 10000),
else port->user_name, port->database_name, port->remote_host,
port->remote_port[0] ? " port=" : "", port->remote_port)));
/*
* for stricter accuracy here we could round - this is close
* enough
*/
snprintf(session_time, sizeof(session_time),
"%d:%02d:%02d.%02d",
hours, minutes, seconds, (int) (end.tv_usec / 10000));
ereport(
LOG,
(errmsg("disconnection: session time: %s%s%s%s%s",
session_time, uname, dbname, remote_host, remote_port)));
} }