Looks good to me.
-Richard
On 2015-02-11 15:59, David Mandelberg wrote:
> From: David Mandelberg <dmand...@bbn.com>
>
> Include more useful information in the error messages from the
> rpki-rtr database code.
> ---
> lib/db/clients/rtr.c | 20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/lib/db/clients/rtr.c b/lib/db/clients/rtr.c
> index 0527482..b6356ec 100644
> --- a/lib/db/clients/rtr.c
> +++ b/lib/db/clients/rtr.c
> @@ -110,7 +110,9 @@ int db_rtr_get_session_id(
> return -1;
> }
>
> - if (wrap_mysql_stmt_execute(conn, stmt, "mysql_stmt_execute() failed"))
> + if (wrap_mysql_stmt_execute(
> + conn, stmt,
> + "mysql_stmt_execute(DB_PSTMT_RTR_GET_SESSION) failed"))
> {
> return -1;
> }
> @@ -183,7 +185,9 @@ int db_rtr_get_latest_sernum(
> conn->stmts[DB_CLIENT_TYPE_RTR][DB_PSTMT_RTR_GET_LATEST_SERNUM];
> int ret;
>
> - if (wrap_mysql_stmt_execute(conn, stmt, "mysql_stmt_execute() failed"))
> + if (wrap_mysql_stmt_execute(
> + conn, stmt,
> + "mysql_stmt_execute(DB_PSTMT_RTR_GET_LATEST_SERNUM) failed"))
> {
> return GET_SERNUM_ERR;
> }
> @@ -248,7 +252,9 @@ static int hasRowsRtrUpdate(
> conn->stmts[DB_CLIENT_TYPE_RTR][DB_PSTMT_RTR_HAS_ROWS_RTR_UPDATE];
> int ret;
>
> - if (wrap_mysql_stmt_execute(conn, stmt, "mysql_stmt_execute() failed"))
> + if (wrap_mysql_stmt_execute(
> + conn, stmt,
> + "mysql_stmt_execute(DB_PSTMT_RTR_HAS_ROWS_RTR_UPDATE) failed"))
> {
> return -1;
> }
> @@ -332,7 +338,9 @@ static int readSerNumAsPrev(
> return GET_SERNUM_ERR;
> }
>
> - if (wrap_mysql_stmt_execute(conn, stmt, "mysql_stmt_execute() failed"))
> + if (wrap_mysql_stmt_execute(
> + conn, stmt,
> + "mysql_stmt_execute(DB_PSTMT_RTR_READ_SER_NUM_AS_PREV) failed"))
> {
> return GET_SERNUM_ERR;
> }
> @@ -431,7 +439,9 @@ static int readSerNumAsCurrent(
> return GET_SERNUM_ERR;
> }
>
> - if (wrap_mysql_stmt_execute(conn, stmt, "mysql_stmt_execute() failed"))
> + if (wrap_mysql_stmt_execute(
> + conn, stmt,
> + "mysql_stmt_execute(DB_PSTMT_RTR_READ_SER_NUM_AS_CURRENT) failed"))
> {
> return GET_SERNUM_ERR;
> }
>
------------------------------------------------------------------------------
_______________________________________________
rpstir-devel mailing list
rpstir-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpstir-devel
