aboutsummaryrefslogtreecommitdiffstats
path: root/cdr
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-07-27 17:05:18 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-07-27 17:05:18 +0000
commita7df13a908bb9f47c158d62893bab7b78233d690 (patch)
tree3cf4bc13fc93bc3462634beb3c69a0dd0e7e2906 /cdr
parent9f83c7c5d395ca2fa75e652cbcfaaaba31622525 (diff)
Merged revisions 77540 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r77540 | file | 2007-07-27 14:04:08 -0300 (Fri, 27 Jul 2007) | 6 lines (closes issue #10310) Reported by: prashant_jois Patches: cdr_pgsql.patch uploaded by prashant (license 114) Finish the Postgresql connection after the log messages are printed so we don't access invalid memory. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@77541 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr')
-rw-r--r--cdr/cdr_pgsql.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index 82dce65e7..4ccd4aa83 100644
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -87,9 +87,9 @@ static int pgsql_log(struct ast_cdr *cdr)
connected = 1;
} else {
pgerror = PQerrorMessage(conn);
- PQfinish(conn);
ast_log(LOG_ERROR, "cdr_pgsql: Unable to connect to database server %s. Calls will not be logged!\n", pghostname);
ast_log(LOG_ERROR, "cdr_pgsql: Reason: %s\n", pgerror);
+ PQfinish(conn);
conn = NULL;
}
}
@@ -146,9 +146,9 @@ static int pgsql_log(struct ast_cdr *cdr)
connected = 1;
} else {
pgerror = PQerrorMessage(conn);
- PQfinish(conn);
ast_log(LOG_ERROR, "cdr_pgsql: Unable to reconnect to database server %s. Calls will not be logged!\n", pghostname);
ast_log(LOG_ERROR, "cdr_pgsql: Reason: %s\n", pgerror);
+ PQfinish(conn);
conn = NULL;
connected = 0;
ast_mutex_unlock(&pgsql_lock);