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:
authorJohn Cai <jcai@gitlab.com>2020-05-26 02:30:01 +0300
committerJohn Cai <jcai@gitlab.com>2020-06-01 19:42:01 +0300
commit87b8dde88db42036d6c03b5537e7ee9b720c1aa5 (patch)
treeec5622a315c1e2ab99ac253bb17f918da1ce77a2 /internal/bootstrap
parent2b825079253900d72cab202b9673b857ed103da5 (diff)
Dependency inject gitlab api
Diffstat (limited to 'internal/bootstrap')
-rw-r--r--internal/bootstrap/server_factory.go10
1 files changed, 6 insertions, 4 deletions
diff --git a/internal/bootstrap/server_factory.go b/internal/bootstrap/server_factory.go
index 30bfea16b..f6d146b06 100644
--- a/internal/bootstrap/server_factory.go
+++ b/internal/bootstrap/server_factory.go
@@ -7,12 +7,14 @@ import (
"gitlab.com/gitlab-org/gitaly/internal/config"
"gitlab.com/gitlab-org/gitaly/internal/rubyserver"
"gitlab.com/gitlab-org/gitaly/internal/server"
+ "gitlab.com/gitlab-org/gitaly/internal/service/hook"
"google.golang.org/grpc"
)
// GitalyServerFactory is a factory of gitaly grpc servers
type GitalyServerFactory struct {
ruby *rubyserver.Server
+ gitlabAPI hook.GitlabAPI
secure, insecure *grpc.Server
}
@@ -24,8 +26,8 @@ type GracefulStoppableServer interface {
}
// NewGitalyServerFactory initializes a rubyserver and then lazily initializes both secure and insecure grpc.Server
-func NewGitalyServerFactory() *GitalyServerFactory {
- return &GitalyServerFactory{ruby: &rubyserver.Server{}}
+func NewGitalyServerFactory(api hook.GitlabAPI) *GitalyServerFactory {
+ return &GitalyServerFactory{ruby: &rubyserver.Server{}, gitlabAPI: api}
}
// StartRuby starts the ruby process
@@ -69,14 +71,14 @@ func (s *GitalyServerFactory) Serve(l net.Listener, secure bool) error {
func (s *GitalyServerFactory) get(secure bool) *grpc.Server {
if secure {
if s.secure == nil {
- s.secure = server.NewSecure(s.ruby, config.Config)
+ s.secure = server.NewSecure(s.ruby, s.gitlabAPI, config.Config)
}
return s.secure
}
if s.insecure == nil {
- s.insecure = server.NewInsecure(s.ruby, config.Config)
+ s.insecure = server.NewInsecure(s.ruby, s.gitlabAPI, config.Config)
}
return s.insecure