sr-dev

sr-dev@lists.kamailio.org

17 participants
44127 discussions

git:janakj/postgres: - improve two errors messages, inform the user that the query is aborted

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: cf7e9b08f3af0c1539d2cb545bf25f4ce78ebd83 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf7e9b0… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jan 7 14:20:45 2009 +0000 - improve two errors messages, inform the user that the query is aborted also on the 'warning' case, better format errors from driver git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5429 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_dbase.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index b02a5ad..da85c46 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -423,9 +423,8 @@ int db_postgres_store_result(const db_con_t* _con, db_res_t** _r) break; /* query failed */ case PGRES_FATAL_ERROR: - LM_ERR("%p - invalid query, execution aborted\n", _con); - LM_ERR("%p: %s\n", _con, PQresStatus(pqresult)); - LM_ERR("%p: %s\n", _con, PQresultErrorMessage(CON_RESULT(_con))); + LM_ERR("invalid query, execution aborted\n"); + LM_ERR("driver error: %s, %s\n", PQresStatus(pqresult), PQresultErrorMessage(CON_RESULT(_con))); db_free_result(*_r); *_r = 0; rc = -3; @@ -440,9 +439,8 @@ int db_postgres_store_result(const db_con_t* _con, db_res_t** _r) /* unexpected response */ case PGRES_BAD_RESPONSE: default: - 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))); + LM_ERR("probable invalid query, execution aborted\n"); + LM_ERR("driver message: %s, %s\n", PQresStatus(pqresult), PQresultErrorMessage(CON_RESULT(_con))); db_free_result(*_r); *_r = 0; rc = -4;

15 years, 10 months

git:janakj/postgres: - fix PGRES_FATAL_ERROR bug in postgres driver

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: a698aa66d1e3a1576859a35d783136661f2b882a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a698aa6… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jul 9 14:30:06 2008 +0000 - fix PGRES_FATAL_ERROR bug in postgres driver - the result set was cleared in this case, but no error was> returned - reported from Andrew O. Zhukov, gnugk at telegroup dot com dot ua - small indention fixes git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4467 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_dbase.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index c00029e..a094c70 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -199,7 +199,7 @@ int db_postgres_fetch_result(const db_con_t* _con, db_res_t** _res, const int nr if (*_res) db_free_result(*_res); - *_res = 0; + *_res = 0; return 0; } @@ -223,6 +223,7 @@ int db_postgres_fetch_result(const db_con_t* _con, db_res_t** _res, const int nr case PGRES_COMMAND_OK: /* Successful completion of a command returning no data (such as INSERT or UPDATE). */ return 0; + case PGRES_TUPLES_OK: /* Successful completion of a command returning data (such as a SELECT or SHOW). */ if (db_postgres_get_columns(_con, *_res) < 0) { @@ -230,12 +231,20 @@ int db_postgres_fetch_result(const db_con_t* _con, db_res_t** _res, const int nr return -2; } break; + + case PGRES_FATAL_ERROR: + LM_ERR("%p - invalid query, execution aborted\n", _con); + LM_ERR("%p - PQresultStatus(%s)\n", _con, PQresStatus(pqresult)); + if (*_res) + db_free_result(*_res); + *_res = 0; + return -3; + case PGRES_EMPTY_QUERY: case PGRES_COPY_OUT: case PGRES_COPY_IN: case PGRES_BAD_RESPONSE: case PGRES_NONFATAL_ERROR: - case PGRES_FATAL_ERROR: LM_WARN("%p - probable invalid query\n", _con); default: LM_WARN("%p - PQresultStatus(%s)\n", @@ -411,6 +420,7 @@ int db_postgres_store_result(const db_con_t* _con, db_res_t** _r) /* Successful completion of a command returning no data (such as INSERT or UPDATE). */ rc = 0; break; + case PGRES_TUPLES_OK: /* Successful completion of a command returning data (such as a SELECT or SHOW). */ if (db_postgres_convert_result(_con, *_r) < 0) { @@ -422,12 +432,21 @@ int db_postgres_store_result(const db_con_t* _con, db_res_t** _r) } rc = 0; break; + + case PGRES_FATAL_ERROR: + LM_ERR("%p - invalid query, execution aborted\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; + rc = -3; + break; + case PGRES_EMPTY_QUERY: case PGRES_COPY_OUT: case PGRES_COPY_IN: case PGRES_BAD_RESPONSE: case PGRES_NONFATAL_ERROR: - case PGRES_FATAL_ERROR: LM_WARN("%p Probable invalid query\n", _con); default: LM_WARN("%p: %s\n", _con, PQresStatus(pqresult));

15 years, 10 months

git:janakj/postgres: - further bug fixes for db_postgres_fetch_result and db_postgres_store_result

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 2377652dacb7945f09330b893f8390a91e006727 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2377652… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jul 10 08:49:27 2008 +0000 - further bug fixes for db_postgres_fetch_result and db_postgres_store_result - return also for all other abnormal query states an error, as the result set is here set to zero too - this is probably a little bit to strict, but in the openser context this types normally should not happen - as the old behaviour could lead to crashes if this gets eventually reported from the driver, this is surely an improvement :-) (most query user check only for return value < 0, and not for == 0) - in case for the PGRES_EMPTY_QUERY this could be not recognized as error from upper layers at all, as this is defined as zero in the pg driver.. - small indention fixes git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4471 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_dbase.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index a094c70..090f767 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -241,18 +241,21 @@ int db_postgres_fetch_result(const db_con_t* _con, db_res_t** _res, const int nr return -3; case PGRES_EMPTY_QUERY: + /* notice or warning */ + case PGRES_NONFATAL_ERROR: + /* status for COPY command, not used */ case PGRES_COPY_OUT: case PGRES_COPY_IN: + /* unexpected response */ case PGRES_BAD_RESPONSE: - case PGRES_NONFATAL_ERROR: LM_WARN("%p - probable invalid query\n", _con); default: LM_WARN("%p - PQresultStatus(%s)\n", _con, PQresStatus(pqresult)); if (*_res) db_free_result(*_res); - *_res = 0; - return 0; + *_res = 0; + return -4; } } else { @@ -427,12 +430,12 @@ int db_postgres_store_result(const db_con_t* _con, db_res_t** _r) LM_ERR("%p Error returned from convert_result()\n", _con); if (*_r) db_free_result(*_r); - *_r = 0; + *_r = 0; rc = -4; } rc = 0; break; - + /* query failed */ case PGRES_FATAL_ERROR: LM_ERR("%p - invalid query, execution aborted\n", _con); LM_ERR("%p: %s\n", _con, PQresStatus(pqresult)); @@ -443,18 +446,21 @@ int db_postgres_store_result(const db_con_t* _con, db_res_t** _r) break; case PGRES_EMPTY_QUERY: + /* notice or warning */ + case PGRES_NONFATAL_ERROR: + /* status for COPY command, not used */ case PGRES_COPY_OUT: case PGRES_COPY_IN: + /* unexpected response */ case PGRES_BAD_RESPONSE: - case PGRES_NONFATAL_ERROR: 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_WARN("%p: %s\n", _con, PQresultErrorMessage(CON_RESULT(_con))); if (*_r) db_free_result(*_r); *_r = 0; - rc = (int)pqresult; + rc = -4; break; }

15 years, 10 months

git:janakj/postgres: - change log level for 'probably invalid queries' from WARN to ERR

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: e6fd5e020a8d85ca8dc016ccd7e8ee43f9a4aaed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e6fd5e0… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)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;

15 years, 10 months

git:janakj/postgres: - change name in copyright headers

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 2881cb885261f42815141bbe607458b28f4703d6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2881cb8… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jul 28 15:39:28 2008 +0000 - change name in copyright headers git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4518 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_db_postgres.c | 6 +++--- modules/db_postgres/km_dbase.c | 6 +++--- modules/db_postgres/km_dbase.h | 6 +++--- modules/db_postgres/km_pg_con.c | 6 +++--- modules/db_postgres/km_pg_con.h | 6 +++--- modules/db_postgres/km_pg_type.h | 6 +++--- modules/db_postgres/km_res.c | 6 +++--- modules/db_postgres/km_res.h | 6 +++--- modules/db_postgres/km_val.c | 6 +++--- modules/db_postgres/km_val.h | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=288…

15 years, 10 months

git:janakj/postgres: - fix some FAQ entries, change missing entity, regenerate READMEs

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 1cc1c5d710c84425f527dfcae5808e5627d69b06 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1cc1c5d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jul 30 09:20:54 2008 +0000 - fix some FAQ entries, change missing entity, regenerate READMEs git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4524 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_README | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/db_postgres/km_README b/modules/db_postgres/km_README index 0be55c7..1c5bde9 100644 --- a/modules/db_postgres/km_README +++ b/modules/db_postgres/km_README @@ -10,8 +10,8 @@ Greg Fausak Copyright � 2003 Greg Fausak Revision History - Revision $Revision$ $Date: 2008-03-19 21:31:30 +0200 - (Wed, 19 Mar 2008) $ + Revision $Revision$ $Date: 2008-03-19 20:31:30 +0100 + (Mi, 19 Mär 2008) $ __________________________________________________________ Table of Contents @@ -21,7 +21,7 @@ Greg Fausak 1.1. Overview 1.2. Dependencies - 1.2.1. OpenSER Modules + 1.2.1. Kamailio Modules 1.2.2. External Libraries or Applications 1.3. Exported Parameters @@ -36,15 +36,15 @@ Chapter 1. Admin Guide 1.2. Dependencies -1.2.1. OpenSER Modules +1.2.1. Kamailio Modules The following modules must be loaded before this module: - * No dependencies on other OpenSER modules. + * No dependencies on other Kamailio modules. 1.2.2. External Libraries or Applications The following libraries or applications must be installed - before running OpenSER with this module loaded: + before running Kamailio with this module loaded: * PostgreSQL library - e.g., libpq5. * PostgreSQL devel library - to compile the module (e.g., libpq-dev).

15 years, 10 months

git:janakj/postgres: - renaming: openser -> kamailio

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 8cac0d9fbf64f674e917d15a5d326ccaecd3b72f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8cac0d9… Author: Klaus Darilion <klaus.darilion(a)pernau.at> Committer: Klaus Darilion <klaus.darilion(a)pernau.at> Date: Wed Aug 6 08:20:30 2008 +0000 - renaming: openser -> kamailio git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4585 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_dbase.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 69e2e92..29f817c 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -42,7 +42,7 @@ * a call (or multiple calls) to PQgetResult. * Removed transaction processing calls (BEGIN/COMMIT/ROLLBACK) as * they added uneeded overhead. Klaus' testing showed in excess of - * 1ms gain by removing each command. In addition, OpenSER only + * 1ms gain by removing each command. In addition, Kamailio only * issues single queries and is not, at this time transaction aware. * The transaction processing routines have been left in place * should this support be needed in the future.

15 years, 10 months

git:janakj/postgres: - renaming: changed entities in documentation

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: ce3d03aff620a7ecbbd90262df66df0b71ffa17d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ce3d03a… Author: Klaus Darilion <klaus.darilion(a)pernau.at> Committer: Klaus Darilion <klaus.darilion(a)pernau.at> Date: Wed Aug 6 10:08:33 2008 +0000 - renaming: changed entities in documentation git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4594 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_doc/db_postgres.xml | 2 +- modules/db_postgres/km_doc/db_postgres_admin.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/db_postgres/km_doc/db_postgres.xml b/modules/db_postgres/km_doc/db_postgres.xml index 9709dae..34e1f31 100644 --- a/modules/db_postgres/km_doc/db_postgres.xml +++ b/modules/db_postgres/km_doc/db_postgres.xml @@ -15,7 +15,7 @@ <book> <bookinfo> <title>postgres Module</title> - <productname class="trade">&opensername;</productname> + <productname class="trade">&kamailioname;</productname> <authorgroup> <author> <firstname>Greg</firstname> diff --git a/modules/db_postgres/km_doc/db_postgres_admin.xml b/modules/db_postgres/km_doc/db_postgres_admin.xml index a1fc42d..3b8548f 100644 --- a/modules/db_postgres/km_doc/db_postgres_admin.xml +++ b/modules/db_postgres/km_doc/db_postgres_admin.xml @@ -11,13 +11,13 @@ <section> <title>Dependencies</title> <section> - <title>&openser; Modules</title> + <title>&kamailio; Modules</title> <para> The following modules must be loaded before this module: <itemizedlist> <listitem> <para> - <emphasis>No dependencies on other &openser; modules</emphasis>. + <emphasis>No dependencies on other &kamailio; modules</emphasis>. </para> </listitem> </itemizedlist> @@ -27,7 +27,7 @@ <title>External Libraries or Applications</title> <para> The following libraries or applications must be installed before running - &openser; with this module loaded: + &kamailio; with this module loaded: <itemizedlist> <listitem> <para>

15 years, 10 months

git:janakj/postgres: - regenerated all READMEs ( make modules-readme exclude_modules="")

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 832d455754bae7ef18599efcd5985a72c46a4cef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=832d455… Author: Klaus Darilion <klaus.darilion(a)pernau.at> Committer: Klaus Darilion <klaus.darilion(a)pernau.at> Date: Wed Aug 6 10:49:19 2008 +0000 - regenerated all READMEs (make modules-readme exclude_modules="") git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4596 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_README | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/db_postgres/km_README b/modules/db_postgres/km_README index 1c5bde9..6eecde4 100644 --- a/modules/db_postgres/km_README +++ b/modules/db_postgres/km_README @@ -1,3 +1,4 @@ + postgres Module Greg Fausak @@ -10,9 +11,9 @@ Greg Fausak Copyright � 2003 Greg Fausak Revision History - Revision $Revision$ $Date: 2008-03-19 20:31:30 +0100 - (Mi, 19 Mär 2008) $ - __________________________________________________________ + Revision $Revision$ $Date: 2008-08-06 12:08:33 +0200 + (Wed, 06 Aug 2008) $ + _________________________________________________________ Table of Contents

15 years, 10 months

git:janakj/postgres: - fix link entity names, patch from Carsten Gross

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 24958f3274961095daf6d6be903bff36ac69384e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=24958f3… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Aug 7 09:15:08 2008 +0000 - fix link entity names, patch from Carsten Gross - regenerate READMEs git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4630 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_postgres/km_README | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/db_postgres/km_README b/modules/db_postgres/km_README index 6eecde4..3a5e085 100644 --- a/modules/db_postgres/km_README +++ b/modules/db_postgres/km_README @@ -1,4 +1,3 @@ - postgres Module Greg Fausak @@ -12,8 +11,8 @@ Greg Fausak Copyright � 2003 Greg Fausak Revision History Revision $Revision$ $Date: 2008-08-06 12:08:33 +0200 - (Wed, 06 Aug 2008) $ - _________________________________________________________ + (Mi, 06 Aug 2008) $ + __________________________________________________________ Table of Contents

15 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev