Author: file
Date: Fri Jul 27 12:05:18 2007
New Revision: 77541
URL: http://svn.digium.com/view/asterisk?view=rev&rev=77541
Log:
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.
........
Modified:
trunk/ (props changed)
trunk/cdr/cdr_pgsql.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/cdr/cdr_pgsql.c
URL:
http://svn.digium.com/view/asterisk/trunk/cdr/cdr_pgsql.c?view=diff&rev=77541&r1=77540&r2=77541
==============================================================================
--- trunk/cdr/cdr_pgsql.c (original)
+++ trunk/cdr/cdr_pgsql.c Fri Jul 27 12:05:18 2007
@@ -87,9 +87,9 @@
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 @@
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);
_______________________________________________
--Bandwidth and Colocation Provided by http://www.api-digital.com--
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
