[GNUnet-SVN] r12747 - gnunet/src/datastore

[gnunet]

Author: grothoff
Date: 2010-08-27 01:32:10 +0200 (Fri, 27 Aug 2010)
New Revision: 12747

Modified:
   gnunet/src/datastore/perf_plugin_datastore_data_postgres.conf
   gnunet/src/datastore/plugin_datastore_postgres.c
   gnunet/src/datastore/test_datastore_api_data_postgres.conf
Log:
stuff

Modified: gnunet/src/datastore/perf_plugin_datastore_data_postgres.conf
===================================================================
--- gnunet/src/datastore/perf_plugin_datastore_data_postgres.conf       
2010-08-26 14:33:03 UTC (rev 12746)
+++ gnunet/src/datastore/perf_plugin_datastore_data_postgres.conf       
2010-08-26 23:32:10 UTC (rev 12747)
@@ -27,7 +27,3 @@
 
 [datastore-postgres]
 CONFIG = dbname=gnunetcheck
-# USER =
-# PASSWORD =
-# HOST = 
-# PORT = 

Modified: gnunet/src/datastore/plugin_datastore_postgres.c
===================================================================
--- gnunet/src/datastore/plugin_datastore_postgres.c    2010-08-26 14:33:03 UTC 
(rev 12746)
+++ gnunet/src/datastore/plugin_datastore_postgres.c    2010-08-26 23:32:10 UTC 
(rev 12747)
@@ -231,7 +231,7 @@
   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 @@
   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 @@
     {
 #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 @@
     {
 #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 @@
       /* 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 @@
 
 #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 @@
     {
 #if DEBUG_POSTGRES
       GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
-                      "postgres",
+                      "datastore-postgres",
                       "Ending iteration (client error)\n");
 #endif
       return;
@@ -694,7 +694,7 @@
        {
 #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 @@
          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 @@
   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;
 }
 

Modified: gnunet/src/datastore/test_datastore_api_data_postgres.conf
===================================================================
--- gnunet/src/datastore/test_datastore_api_data_postgres.conf  2010-08-26 
14:33:03 UTC (rev 12746)
+++ gnunet/src/datastore/test_datastore_api_data_postgres.conf  2010-08-26 
23:32:10 UTC (rev 12747)
@@ -37,10 +37,6 @@
 
 [datastore-postgres]
 CONFIG = dbname=gnunetcheck
-# USER =
-# PASSWORD =
-# HOST = 
-# PORT = 
 
 [statistics]
 PORT = 22667