[GRASS-SVN] r69483 - grass/branches/releasebranch_7_0/db/drivers/postgres

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Sep 14 04:50:14 PDT 2016


Author: martinl
Date: 2016-09-14 04:50:14 -0700 (Wed, 14 Sep 2016)
New Revision: 69483

Modified:
   grass/branches/releasebranch_7_0/db/drivers/postgres/db.c
Log:
db driver pg: fix connection debug message to include also login info (merge 69481 from trunk)

Modified: grass/branches/releasebranch_7_0/db/drivers/postgres/db.c
===================================================================
--- grass/branches/releasebranch_7_0/db/drivers/postgres/db.c	2016-09-14 11:48:05 UTC (rev 69482)
+++ grass/branches/releasebranch_7_0/db/drivers/postgres/db.c	2016-09-14 11:50:14 UTC (rev 69483)
@@ -54,19 +54,18 @@
 	return DB_FAILED;
     }
 
-    G_debug(3,
-	    "db_driver_open_database(): host = %s, port = %s, options = %s, tty = %s, "
-	    "dbname = %s, user = %s, password = %s, host = %s, port = %s "
-	    "schema = %s", pgconn.host, pgconn.port, pgconn.options,
-	    pgconn.tty, pgconn.dbname, pgconn.user, pgconn.password,
-            pgconn.host, pgconn.port,
-	    pgconn.schema);
-
     db_get_login2("pg", name, &user, &password, &host, &port);
 
     pg_conn = PQsetdbLogin(host, port, pgconn.options, pgconn.tty,
 			   pgconn.dbname, user, password);
-    
+
+    G_debug(3,
+	    "db_driver_open_database(): host = %s, port = %s, options = %s, tty = %s, "
+	    "dbname = %s, user = %s, password = %s "
+	    "schema = %s", host, port, pgconn.options,
+	    pgconn.tty, pgconn.dbname, user, password,
+	    pgconn.schema);
+
     if (PQstatus(pg_conn) == CONNECTION_BAD) {
 	db_d_append_error("%s\n%s",
 			  _("Connection failed."),



More information about the grass-commit mailing list