gddo-admin: use the new database API for admin commands

Use default context.TODO() when initializing database for usage without
remote_api for search. This CL mainly fixes the gddo-admin commands.

Change-Id: I8518f3aeff57d3e733a99a45c50177cffaf35621
Reviewed-on: https://go-review.googlesource.com/57730
Reviewed-by: Ross Light <[email protected]>

Author: shantuo

database/database.go

@@ -132,12 +132,12 @@ func newAppEngineContext(host string) (context.Context, error) {
 	return remote_api.NewRemoteContext(host, client)
 }
 
-// New creates a gddo database. serverUri, idleTimeout, and logConn configure
+// New creates a gddo database. serverURI, idleTimeout, and logConn configure
 // the use of redis. gaeEndpoint is the target of the App Engine remoteapi
 // endpoint.
-func New(serverUri string, idleTimeout time.Duration, logConn bool, gaeEndpoint string) (*Database, error) {
+func New(serverURI string, idleTimeout time.Duration, logConn bool, gaeEndpoint string) (*Database, error) {
 	pool := &redis.Pool{
-		Dial:        newDBDialer(serverUri, logConn),
+		Dial:        newDBDialer(serverURI, logConn),
 		MaxIdle:     10,
 		IdleTimeout: idleTimeout,
 	}
@@ -148,9 +148,12 @@ func New(serverUri string, idleTimeout time.Duration, logConn bool, gaeEndpoint
 	}
 	c.Close()
 
-	gaeCtx, err := newAppEngineContext(gaeEndpoint)
-	if err != nil {
-		return nil, err
+	gaeCtx := context.TODO()
+	if gaeEndpoint != "" {
+		var err error
+		if gaeCtx, err = newAppEngineContext(gaeEndpoint); err != nil {
+			return nil, err
+		}
 	}
 
 	return &Database{Pool: pool, AppEngineContext: gaeCtx}, nil
@@ -753,6 +756,8 @@ func (db *Database) Importers(path string) ([]Package, error) {
 	return db.getPackages("index:import:"+path, false)
 }
 
+// Block puts a domain, repo or package into the block set, removes all the
+// packages under it from the database and prevents future crawling from it.
 func (db *Database) Block(root string) error {
 	c := db.Pool.Get()
 	defer c.Close()
@@ -785,6 +790,8 @@ var isBlockedScript = redis.NewScript(0, `
     return  0
 `)
 
+// IsBlocked returns whether the package is blocked or belongs to a blocked
+// domain/repo.
 func (db *Database) IsBlocked(path string) (bool, error) {
 	c := db.Pool.Get()
 	defer c.Close()

doc/get.go

@@ -8,10 +8,11 @@
 package doc
 
 import (
-	"github.com/golang/gddo/gosrc"
 	"go/doc"
 	"net/http"
 	"strings"
+
+	"github.com/golang/gddo/gosrc"
 )
 
 func Get(client *http.Client, importPath string, etag string) (*Package, error) {

gddo-admin/block.go

@@ -7,9 +7,10 @@
 package main
 
 import (
-	"github.com/golang/gddo/database"
 	"log"
 	"os"
+
+	"github.com/golang/gddo/database"
 )
 
 var blockCommand = &command{
@@ -23,7 +24,7 @@ func block(c *command) {
 		c.printUsage()
 		os.Exit(1)
 	}
-	db, err := database.New()
+	db, err := database.New(*redisServer, *dbIdleTimeout, false, gaeEndpoint)
 	if err != nil {
 		log.Fatal(err)
 	}

gddo-admin/crawl.go

@@ -28,7 +28,7 @@ func crawl(c *command) {
 		c.printUsage()
 		os.Exit(1)
 	}
-	db, err := database.New()
+	db, err := database.New(*redisServer, *dbIdleTimeout, false, gaeEndpoint)
 	if err != nil {
 		log.Fatal(err)
 	}

gddo-admin/dangle.go

@@ -26,7 +26,7 @@ func dangle(c *command) {
 		c.printUsage()
 		os.Exit(1)
 	}
-	db, err := database.New()
+	db, err := database.New(*redisServer, *dbIdleTimeout, false, gaeEndpoint)
 	if err != nil {
 		log.Fatal(err)
 	}

gddo-admin/delete.go

@@ -24,7 +24,7 @@ func del(c *command) {
 		c.printUsage()
 		os.Exit(1)
 	}
-	db, err := database.New()
+	db, err := database.New(*redisServer, *dbIdleTimeout, false, gaeEndpoint)
 	if err != nil {
 		log.Fatal(err)
 	}

gddo-admin/main.go

@@ -12,6 +12,7 @@ import (
 	"fmt"
 	"os"
 	"strings"
+	"time"
 )
 
 type command struct {
@@ -26,6 +27,14 @@ func (c *command) printUsage() {
 	c.flag.PrintDefaults()
 }
 
+var (
+	project       = flag.String("project", "", "App Engine project ID used to interact with remote API.")
+	redisServer   = flag.String("db-server", "redis://127.0.0.1:6379", "URI of Redis server.")
+	dbIdleTimeout = flag.Duration("db-idle-timeout", 250*time.Second, "Close database connections after remaining idle for this duration.")
+)
+
+var gaeEndpoint string
+
 var commands = []*command{
 	blockCommand,
 	reindexCommand,
@@ -48,10 +57,18 @@ func printUsage() {
 	}
 }
 
+func setDefaults() {
+	if *project != "" {
+		gaeEndpoint = fmt.Sprintf("serviceproxy-dot-%s.appspot.com", *project)
+	}
+}
+
 func main() {
 	flag.Usage = printUsage
 	flag.Parse()
 	args := flag.Args()
+	setDefaults()
+
 	if len(args) >= 1 {
 		for _, c := range commands {
 			if args[0] == c.name {

gddo-admin/popular.go

@@ -30,7 +30,7 @@ func popular(c *command) {
 		c.printUsage()
 		os.Exit(1)
 	}
-	db, err := database.New()
+	db, err := database.New(*redisServer, *dbIdleTimeout, false, gaeEndpoint)
 	if err != nil {
 		log.Fatal(err)
 	}

gddo-admin/reindex.go

@@ -51,7 +51,7 @@ func reindex(c *command) {
 		c.printUsage()
 		os.Exit(1)
 	}
-	db, err := database.New()
+	db, err := database.New(*redisServer, *dbIdleTimeout, false, gaeEndpoint)
 	if err != nil {
 		log.Fatal(err)
 	}

gddo-admin/stats.go

@@ -37,7 +37,7 @@ func stats(c *command) {
 		c.printUsage()
 		os.Exit(1)
 	}
-	db, err := database.New()
+	db, err := database.New(*redisServer, *dbIdleTimeout, false, gaeEndpoint)
 	if err != nil {
 		log.Fatal(err)
 	}