Module: sip-router Branch: janakj/postgres Commit: e6fd5e020a8d85ca8dc016ccd7e8ee43f9a4aaed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e6fd5e02...
Author: Henning Westerholt henning.westerholt@1und1.de Committer: Henning Westerholt henning.westerholt@1und1.de Date: Mon Jul 14 10:43:45 2008 +0000
- change log level for 'probably invalid queries' from WARN to ERR - as we stop execution and return a failure anyway, we should also inform the user with the correct log level about this - move error message to default case
git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4485 689a6050-402a-0410-94f2-e92a70836424
---
modules/db_postgres/km_dbase.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 090f767..dbc1469 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -235,6 +235,7 @@ int db_postgres_fetch_result(const db_con_t* _con, db_res_t** _res, const int nr case PGRES_FATAL_ERROR: LM_ERR("%p - invalid query, execution aborted\n", _con); LM_ERR("%p - PQresultStatus(%s)\n", _con, PQresStatus(pqresult)); + LM_ERR("%p: %s\n", _con, PQresultErrorMessage(CON_RESULT(_con))); if (*_res) db_free_result(*_res); *_res = 0; @@ -248,11 +249,11 @@ int db_postgres_fetch_result(const db_con_t* _con, db_res_t** _res, const int nr case PGRES_COPY_IN: /* unexpected response */ case PGRES_BAD_RESPONSE: - LM_WARN("%p - probable invalid query\n", _con); default: - LM_WARN("%p - PQresultStatus(%s)\n", - _con, PQresStatus(pqresult)); - if (*_res) + LM_ERR("%p - probable invalid query\n", _con); + LM_ERR("%p - PQresultStatus(%s)\n", _con, PQresStatus(pqresult)); + LM_ERR("%p: %s\n", _con, PQresultErrorMessage(CON_RESULT(_con))); + if (*_res) db_free_result(*_res); *_res = 0; return -4; @@ -453,10 +454,10 @@ int db_postgres_store_result(const db_con_t* _con, db_res_t** _r) case PGRES_COPY_IN: /* unexpected response */ case PGRES_BAD_RESPONSE: - LM_WARN("%p Probable invalid query\n", _con); default: - LM_WARN("%p: %s\n", _con, PQresStatus(pqresult)); - LM_WARN("%p: %s\n", _con, PQresultErrorMessage(CON_RESULT(_con))); + LM_ERR("%p Probable invalid query\n", _con); + LM_ERR("%p: %s\n", _con, PQresStatus(pqresult)); + LM_ERR("%p: %s\n", _con, PQresultErrorMessage(CON_RESULT(_con))); if (*_r) db_free_result(*_r);
*_r = 0;
-
Jan Janak