[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r38192 - in gnunet/src: postgres pq
From: |
gnunet |
Subject: |
[GNUnet-SVN] r38192 - in gnunet/src: postgres pq |
Date: |
Mon, 24 Oct 2016 09:44:27 +0200 |
Author: grothoff
Date: 2016-10-24 09:44:26 +0200 (Mon, 24 Oct 2016)
New Revision: 38192
Modified:
gnunet/src/postgres/postgres.c
gnunet/src/pq/pq.c
Log:
put logging into place to diagnose #4737
Modified: gnunet/src/postgres/postgres.c
===================================================================
--- gnunet/src/postgres/postgres.c 2016-10-23 19:53:59 UTC (rev 38191)
+++ gnunet/src/postgres/postgres.c 2016-10-24 07:44:26 UTC (rev 38192)
@@ -54,14 +54,22 @@
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 @@
{
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 @@
{
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 @@
/* 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 @@
}
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 @@
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,
Modified: gnunet/src/pq/pq.c
===================================================================
--- gnunet/src/pq/pq.c 2016-10-23 19:53:59 UTC (rev 38191)
+++ gnunet/src/pq/pq.c 2016-10-24 07:44:26 UTC (rev 38192)
@@ -85,6 +85,9 @@
off += x->num_params;
}
GNUNET_assert (off == len);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Executing prepared SQL statement `%s'\n",
+ name);
res = PQexecPrepared (db_conn,
name,
len,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r38192 - in gnunet/src: postgres pq,
gnunet <=