From 16d68eddbf72023e2c8d25bf59a983599d17211a Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Thu, 30 May 2019 13:57:52 +0200 Subject: [PATCH] Was throwing: currval of sequence builds_build_id_seq is not yet defined in this session --- cmd/drone-server/setup.go | 6 ++---- store/datastore/sql/postgres/files/counts.sql | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cmd/drone-server/setup.go b/cmd/drone-server/setup.go index 72162ea86..f16affa7e 100644 --- a/cmd/drone-server/setup.go +++ b/cmd/drone-server/setup.go @@ -243,10 +243,6 @@ func setupMetrics(g *errgroup.Group, store_ store.Store) { pendingJobs.Set(float64(stats.Stats.Pending)) runningJobs.Set(float64(stats.Stats.Running)) workers.Set(float64(stats.Stats.Workers)) - - buildCount, _ := store_.GetBuildCount() - builds.Set(float64(buildCount)) - time.Sleep(500 * time.Millisecond) } }) @@ -254,6 +250,8 @@ func setupMetrics(g *errgroup.Group, store_ store.Store) { for { repoCount, _ := store_.GetRepoCount() userCount, _ := store_.GetUserCount() + buildCount, _ := store_.GetBuildCount() + builds.Set(float64(buildCount)) users.Set(float64(userCount)) repos.Set(float64(repoCount)) time.Sleep(10 * time.Second) diff --git a/store/datastore/sql/postgres/files/counts.sql b/store/datastore/sql/postgres/files/counts.sql index b9c34cf1a..38bb531ab 100644 --- a/store/datastore/sql/postgres/files/counts.sql +++ b/store/datastore/sql/postgres/files/counts.sql @@ -11,4 +11,5 @@ WHERE repo_active = true -- name: count-builds -SELECT currval('builds_build_id_seq'); +SELECT count(1) +FROM builds