Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer (GitLab) <jacob@gitlab.com>2018-03-05 21:33:46 +0300
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2018-03-05 21:33:46 +0300
commit3b751d3116d21ed1a8739bfa2855a8ff23dea3b5 (patch)
tree30a4d849d1b48181dbf0e17be63abd3583f1e4c7 /internal/rubyserver
parent37c8b66e3ad87e68d18c677f0155fc01c8e6d4cb (diff)
Use only 1 gitaly-ruby process in test
Diffstat (limited to 'internal/rubyserver')
-rw-r--r--internal/rubyserver/rubyserver.go2
-rw-r--r--internal/rubyserver/worker.go7
2 files changed, 1 insertions, 8 deletions
diff --git a/internal/rubyserver/rubyserver.go b/internal/rubyserver/rubyserver.go
index 35dcdcca0..a333432ae 100644
--- a/internal/rubyserver/rubyserver.go
+++ b/internal/rubyserver/rubyserver.go
@@ -114,7 +114,7 @@ func Start() (*Server, error) {
gitalyRuby := path.Join(cfg.Ruby.Dir, "bin/gitaly-ruby")
s := &Server{}
- for i := 0; i < numWorkers; i++ {
+ for i := 0; i < cfg.Ruby.NumWorkers; i++ {
name := fmt.Sprintf("gitaly-ruby.%d", i)
socketPath := socketPath(i)
diff --git a/internal/rubyserver/worker.go b/internal/rubyserver/worker.go
index 41de27a6d..a06e09618 100644
--- a/internal/rubyserver/worker.go
+++ b/internal/rubyserver/worker.go
@@ -13,13 +13,6 @@ import (
log "github.com/sirupsen/logrus"
)
-const (
- // We might want numWorkers to be configurable in the future. But at the
- // moment we only support 'pick first' balancing so there is no point in
- // having more than 2 workers yet.
- numWorkers = 2
-)
-
var (
terminationCounter = prometheus.NewCounterVec(
prometheus.CounterOpts{