| Index: datahopper/go/datahopper/main.go
|
| diff --git a/datahopper/go/datahopper/main.go b/datahopper/go/datahopper/main.go
|
| index 101db8ee7f1f6388ed3c6db8883119fa209a78fc..b15fb65d39df01f35347931805fd4b074666290f 100644
|
| --- a/datahopper/go/datahopper/main.go
|
| +++ b/datahopper/go/datahopper/main.go
|
| @@ -14,7 +14,6 @@ import (
|
| "skia.googlesource.com/buildbot.git/datahopper/go/autoroll_ingest"
|
| "skia.googlesource.com/buildbot.git/go/buildbot"
|
| "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/metadata"
|
| )
|
| @@ -62,13 +61,7 @@ func main() {
|
| go autoroll_ingest.LoadAutoRollData(dbClient, *workdir)
|
| go func() {
|
| // Initialize the buildbot database.
|
| - var conf *database.DatabaseConfig
|
| - if *testing {
|
| - conf = buildbot.LocalMySQLTestDatabaseConfig("test_user", "")
|
| - } else {
|
| - conf = buildbot.ProdDatabaseConfig(false)
|
| - }
|
| - if err := buildbot.InitDB(conf); err != nil {
|
| + if err := buildbot.InitDB(buildbot.DatabaseConfig(*testing)); err != nil {
|
| glog.Fatal(err)
|
| }
|
| // Create the Git repo.
|
|
|