diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-10-24 07:44:26 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-10-24 07:44:26 +0000 |
| commit | b81008870d47cfb342bc2a689718fd03eee10cd4 (patch) | |
| tree | 04fa93931f8bed6c0a3d4089e26f396d4c6df846 /src/postgres/postgres.c | |
| parent | 10f9bc91ab9d758d0d60dd672206027cd136342a (diff) | |
put logging into place to diagnose #4737
Diffstat (limited to 'src/postgres/postgres.c')
| -rw-r--r-- | src/postgres/postgres.c | 58 |
1 files changed, 44 insertions, 14 deletions
diff --git a/src/postgres/postgres.c b/src/postgres/postgres.c index 4c8b2b0468..f286ff7058 100644 --- a/src/postgres/postgres.c +++ b/src/postgres/postgres.c @@ -54,14 +54,22 @@ GNUNET_POSTGRES_check_result_ (PGconn *dbh, GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "postgres", "Postgres failed to allocate result for `%s:%s' at %s:%d\n", - command, args, filename, line); + command, + args, + filename, + line); return GNUNET_SYSERR; } if (PQresultStatus (ret) != expected_status) { GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "postgres", _("`%s:%s' failed at %s:%d with error: %s\n"), - command, args, filename, line, PQerrorMessage (dbh)); + "postgres", + _("`%s:%s' failed at %s:%d with error: %s\n"), + command, + args, + filename, + line, + PQerrorMessage (dbh)); PQclear (ret); return GNUNET_SYSERR; } @@ -86,10 +94,21 @@ GNUNET_POSTGRES_exec_ (PGconn * dbh, { PGresult *ret; - ret = PQexec (dbh, sql); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Executing SQL statement `%s' at %s:%d\n", + sql, + filename, + line); + ret = PQexec (dbh, + sql); if (GNUNET_OK != - GNUNET_POSTGRES_check_result_ (dbh, ret, PGRES_COMMAND_OK, "PQexec", sql, - filename, line)) + GNUNET_POSTGRES_check_result_ (dbh, + ret, + PGRES_COMMAND_OK, + "PQexec", + sql, + filename, + line)) return GNUNET_SYSERR; PQclear (ret); return GNUNET_OK; @@ -117,6 +136,12 @@ GNUNET_POSTGRES_prepare_ (PGconn *dbh, { PGresult *ret; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Preparing SQL statement `%s' as `%s' at %s:%d\n", + sql, + name, + filename, + line); ret = PQprepare (dbh, name, sql, @@ -151,7 +176,10 @@ GNUNET_POSTGRES_connect (const struct GNUNET_CONFIGURATION_Handle * cfg, /* Open database and precompile statements */ if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_string (cfg, section, "CONFIG", &conninfo)) + GNUNET_CONFIGURATION_get_value_string (cfg, + section, + "CONFIG", + &conninfo)) conninfo = NULL; dbh = PQconnectdb (conninfo == NULL ? "" : conninfo); GNUNET_free_non_null (conninfo); @@ -162,7 +190,8 @@ GNUNET_POSTGRES_connect (const struct GNUNET_CONFIGURATION_Handle * cfg, } if (PQstatus (dbh) != CONNECTION_OK) { - GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "postgres", + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, + "postgres", _("Unable to initialize Postgres: %s\n"), PQerrorMessage (dbh)); PQfinish (dbh); @@ -192,12 +221,13 @@ GNUNET_POSTGRES_delete_by_rowid (PGconn * dbh, const int paramFormats[] = { 1 }; PGresult *ret; - ret = - PQexecPrepared (dbh, stmt, 1, - paramValues, - paramLengths, - paramFormats, - 1); + ret = PQexecPrepared (dbh, + stmt, + 1, + paramValues, + paramLengths, + paramFormats, + 1); if (GNUNET_OK != GNUNET_POSTGRES_check_result_ (dbh, ret, PGRES_COMMAND_OK, |