From ac955dcaf0eb30869f47d6aaf3464ceaebd5fa26 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 26 Aug 2010 23:32:10 +0000
Subject: [PATCH] stuff

---
 .../perf_plugin_datastore_data_postgres.conf  |  4 ----
 src/datastore/plugin_datastore_postgres.c     | 21 ++++++++++---------
 .../test_datastore_api_data_postgres.conf     |  4 ----
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/datastore/perf_plugin_datastore_data_postgres.conf b/src/datastore/perf_plugin_datastore_data_postgres.conf
index 82ee17314..c2a181bc7 100644
--- a/src/datastore/perf_plugin_datastore_data_postgres.conf
+++ b/src/datastore/perf_plugin_datastore_data_postgres.conf
@@ -27,7 +27,3 @@ AUTOSTART = NO
 
 [datastore-postgres]
 CONFIG = dbname=gnunetcheck
-# USER =
-# PASSWORD =
-# HOST = 
-# PORT = 
diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c
index c3f3b9af4..889309784 100644
--- a/src/datastore/plugin_datastore_postgres.c
+++ b/src/datastore/plugin_datastore_postgres.c
@@ -231,7 +231,7 @@ init_connection (struct Plugin *plugin)
   if (PQstatus (plugin->dbh) != CONNECTION_OK)
     {
       GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
-		       "postgres",
+		       "datastore-postgres",
 		       _("Unable to initialize Postgres: %s"),
 		       PQerrorMessage (plugin->dbh));
       PQfinish (plugin->dbh);
@@ -521,7 +521,7 @@ postgres_plugin_put (void *cls,
   plugin->payload += size;
 #if DEBUG_POSTGRES
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
-		   "postgres",
+		   "datastore-postgres",
 		   "Stored %u bytes in database, new payload is %llu\n",
 		   (unsigned int) size,
 		   (unsigned long long) plugin->payload);
@@ -561,7 +561,7 @@ postgres_next_request_cont (void *next_cls,
     {
 #if DEBUG_POSTGRES
       GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
-		       "postgres",
+		       "datastore-postgres",
 		       "Ending iteration (%s)\n",
 		       (GNUNET_YES == nrc->end_it) ? "client requested it" : "completed result set");
 #endif
@@ -594,7 +594,7 @@ postgres_next_request_cont (void *next_cls,
     {
 #if DEBUG_POSTGRES
       GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
-		       "postgres",
+		       "datastore-postgres",
 		       "Ending iteration (postgres error)\n");
 #endif
       nrc->iter (nrc->iter_cls, 
@@ -609,7 +609,7 @@ postgres_next_request_cont (void *next_cls,
       /* no result */
 #if DEBUG_POSTGRES
       GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
-		       "postgres",
+		       "datastore-postgres",
 		       "Ending iteration (no more results)\n");
 #endif
       nrc->iter (nrc->iter_cls, 
@@ -663,7 +663,7 @@ postgres_next_request_cont (void *next_cls,
 
 #if DEBUG_POSTGRES
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
-		   "postgres",
+		   "datastore-postgres",
 		   "Found result of size %u bytes and type %u in database\n",
 		   (unsigned int) size,
 		   (unsigned int) type);
@@ -683,7 +683,7 @@ postgres_next_request_cont (void *next_cls,
     {
 #if DEBUG_POSTGRES
       GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
-		       "postgres",
+		       "datastore-postgres",
 		       "Ending iteration (client error)\n");
 #endif
       return;
@@ -694,7 +694,7 @@ postgres_next_request_cont (void *next_cls,
 	{
 #if DEBUG_POSTGRES
 	  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
-			   "postgres",
+			   "datastore-postgres",
 			   "Deleting %u bytes from database, current payload is %llu\n",
 			   (unsigned int) size,
 			   (unsigned long long) plugin->payload);
@@ -703,7 +703,7 @@ postgres_next_request_cont (void *next_cls,
 	  plugin->payload -= size;
 #if DEBUG_POSTGRES
 	  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
-			   "postgres",
+			   "datastore-postgres",
 			   "Deleted %u bytes from database, new payload is %llu\n",
 			   (unsigned int) size,
 			   (unsigned long long) plugin->payload);
@@ -1220,7 +1220,8 @@ libgnunet_plugin_datastore_postgres_init (void *cls)
   api->iter_all_now = &postgres_plugin_iter_all_now;
   api->drop = &postgres_plugin_drop;
   GNUNET_log_from (GNUNET_ERROR_TYPE_INFO,
-                   "postgres", _("Postgres database running\n"));
+                   "datastore-postgres",
+		   _("Postgres database running\n"));
   return api;
 }
 
diff --git a/src/datastore/test_datastore_api_data_postgres.conf b/src/datastore/test_datastore_api_data_postgres.conf
index 0bc55852e..b370c5cbb 100644
--- a/src/datastore/test_datastore_api_data_postgres.conf
+++ b/src/datastore/test_datastore_api_data_postgres.conf
@@ -37,10 +37,6 @@ BINARY = gnunet-service-datastore
 
 [datastore-postgres]
 CONFIG = dbname=gnunetcheck
-# USER =
-# PASSWORD =
-# HOST = 
-# PORT = 
 
 [statistics]
 PORT = 22667
-- 
2.25.1