appengine/go11x/cloudsql: allow override of socket file (#628)

GoogleCloudPlatform · Sep 24, 2018 · e2dd98b · e2dd98b
1 parent 83adaf7
commit e2dd98b
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/appengine/go11x/cloudsql/cloudsql.go b/appengine/go11x/cloudsql/cloudsql.go
@@ -44,11 +44,17 @@ func DB() *sql.DB {
 		connectionName = mustGetenv("CLOUDSQL_CONNECTION_NAME")
 		user           = mustGetenv("CLOUDSQL_USER")
 		password       = os.Getenv("CLOUDSQL_PASSWORD") // NOTE: password may be empty
+		socket         = os.Getenv("CLOUDSQL_SOCKET_PREFIX")
 	)
 
+	// /cloudsql is used on App Engine.
+	if socket == "" {
+		socket = "/cloudsql"
+	}
+
 	// MySQL Connection, comment out to use PostgreSQL.
 	// connection string format: USER:PASSWORD@unix(/cloudsql/)PROJECT_ID:REGION_ID:INSTANCE_ID/[DB_NAME]
-	dbURI := fmt.Sprintf("%s:%s@unix(/cloudsql/%s)/", user, password, connectionName)
+	dbURI := fmt.Sprintf("%s:%s@unix(%s/%s)/", user, password, socket, connectionName)
 	conn, err := sql.Open("mysql", dbURI)
 
 	// PostgreSQL Connection, uncomment to use.