diff options
| author | Julie Qiu <julie@golang.org> | 2021-06-15 18:23:21 -0400 |
|---|---|---|
| committer | Julie Qiu <julie@golang.org> | 2021-06-16 15:02:19 +0000 |
| commit | 9584e908fb4e2de4faff96c6dedbae910bf76233 (patch) | |
| tree | c51cf70dcb2f6005945a98ff36549123e7f1689b /devtools/cmd | |
| parent | 31e5ba51fefc00b98244887549b96cdf662b34ad (diff) | |
| download | go-x-pkgsite-9584e908fb4e2de4faff96c6dedbae910bf76233.tar.xz | |
devtools/cmd/seeddb/seeddb: fix script
Since seeddb is moved to devtools/cmd/seeddb/seeddb,
cmd/internal/cmdconfig can no longer be used.
Instead, use database.Open directly.
Change-Id: I2262d36f2199a275dbc62306528788bdf21f0727
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/327932
Trust: Julie Qiu <julie@golang.org>
Run-TryBot: Julie Qiu <julie@golang.org>
TryBot-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jonathan Amsterdam <jba@google.com>
Diffstat (limited to 'devtools/cmd')
| -rw-r--r-- | devtools/cmd/seeddb/seeddb/main.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/devtools/cmd/seeddb/seeddb/main.go b/devtools/cmd/seeddb/seeddb/main.go index 57173908..5815df7b 100644 --- a/devtools/cmd/seeddb/seeddb/main.go +++ b/devtools/cmd/seeddb/seeddb/main.go @@ -19,8 +19,8 @@ import ( "time" _ "github.com/jackc/pgx/v4/stdlib" // for pgx driver - "golang.org/x/pkgsite/cmd/internal/cmdconfig" "golang.org/x/pkgsite/internal/config" + "golang.org/x/pkgsite/internal/database" "golang.org/x/pkgsite/internal/derrors" "golang.org/x/pkgsite/internal/log" "golang.org/x/pkgsite/internal/postgres" @@ -31,7 +31,7 @@ import ( ) var ( - seedfile = flag.String("static", "cmd/internal/seeddb/seed.txt", "filename containing modules for seeding the database") + seedfile = flag.String("static", "devtools/cmd/seeddb/seeddb/seed.txt", "filename containing modules for seeding the database") ) func main() { @@ -42,14 +42,14 @@ func main() { if err != nil { log.Fatal(ctx, err) } - cfg.Dump(os.Stdout) - log.SetLevel(cfg.LogLevel) - db, err := cmdconfig.OpenDB(ctx, cfg, false) + // Wrap the postgres driver with our own wrapper, which adds OpenCensus instrumentation. + ddb, err := database.Open("pgx", cfg.DBConnInfo(), "seeddb") if err != nil { - log.Fatal(ctx, err) + log.Fatalf(ctx, "database.Open for host %s failed with %v", cfg.DBHost, err) } + db := postgres.New(ddb) defer db.Close() if err := run(ctx, db, cfg.ProxyURL); err != nil { |