Overhaul database package

perf/go/skiaperf/main.go

 package main
 
 import (
         "encoding/json"
         "flag"
         "fmt"
         ehtml "html"
         "html/template"
         "math/rand"
         "net/http"
         "os"
         "path/filepath"
         "regexp"
         "runtime"
         "strconv"
         "strings"
         "time"
 )
 
 import (
         "github.com/fiorix/go-web/autogzip"
         "github.com/golang/glog"
 )
 
 import (
         "skia.googlesource.com/buildbot.git/go/common"
+        "skia.googlesource.com/buildbot.git/go/database"
         "skia.googlesource.com/buildbot.git/go/gitinfo"
         "skia.googlesource.com/buildbot.git/go/login"
         "skia.googlesource.com/buildbot.git/go/metadata"
         "skia.googlesource.com/buildbot.git/go/util"
         "skia.googlesource.com/buildbot.git/perf/go/activitylog"
         "skia.googlesource.com/buildbot.git/perf/go/alerting"
         "skia.googlesource.com/buildbot.git/perf/go/annotate"
         "skia.googlesource.com/buildbot.git/perf/go/clustering"
         "skia.googlesource.com/buildbot.git/perf/go/config"
         "skia.googlesource.com/buildbot.git/perf/go/db"
@@ skipping 1014 matching lines @@
 
 func makeResourceHandler() func(http.ResponseWriter, *http.Request) {
         fileServer := http.FileServer(http.Dir("./"))
         return func(w http.ResponseWriter, r *http.Request) {
                 w.Header().Add("Cache-Control", string(300))
                 fileServer.ServeHTTP(w, r)
         }
 }
 
 func main() {
+        // Setup DB flags.
+        database.SetupFlags(db.PROD_DB_HOST, db.PROD_DB_PORT, database.USER_RW, db.PROD_DB_NAME)
+
         common.InitWithMetrics("skiaperf", *graphiteServer)
         Init()
-        db.Init(db.ProdDatabaseConfig(*local))
+        conf, err := database.ConfigFromFlagsAndMetadata(*local, db.MigrationSteps())
+        if err != nil {
+                glog.Fatal(err)
+        }
+        db.Init(conf)
         stats.Start(nanoTileStore, git)
         alerting.Start(nanoTileStore, *apikey)
 
         // By default use a set of credentials setup for localhost access.
         var cookieSalt = "notverysecret"
         var clientID = "31977622648-1873k0c1e5edaka4adpv1ppvhr5id3qm.apps.googleusercontent.com"
         var clientSecret = "cw0IosPu4yjaG2KWmppj2guj"
         var redirectURL = fmt.Sprintf("http://localhost%s/oauth2callback/", *port)
         if !*local {
                 cookieSalt = metadata.MustGet(COOKIESALT_METADATA_KEY)
@@ skipping 26 matching lines @@
         http.HandleFunc("/compare/", autogzip.HandleFunc(compareHandler))
         http.HandleFunc("/calc/", autogzip.HandleFunc(calcHandler))
         http.HandleFunc("/help/", autogzip.HandleFunc(helpHandler))
         http.HandleFunc("/oauth2callback/", login.OAuth2CallbackHandler)
         http.HandleFunc("/logout/", login.LogoutHandler)
         http.HandleFunc("/loginstatus/", login.StatusHandler)
 
         glog.Infoln("Ready to serve.")
         glog.Fatal(http.ListenAndServe(*port, nil))
 }