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:
authorPatrick Steinhardt <psteinhardt@gitlab.com>2022-02-21 13:50:42 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2022-02-21 13:50:42 +0300
commit78b764d3c1951fd395c3ddc84476144f36d8b9f3 (patch)
tree4b58b74bfc6de1a8b5e745531d67693ae594fc19
parente915fc71117af357cdca898bd96019d7ef73114d (diff)
parent5585b14c7e55de54fc49c05fef26cbf65221dedc (diff)
Merge branch 'pks-gitaly-fix-unset-housekeeping-manager' into 'master'
gitaly: Fix missing housekeeping manager dependency See merge request gitlab-org/gitaly!4365
-rw-r--r--cmd/gitaly/main.go27
1 files changed, 14 insertions, 13 deletions
diff --git a/cmd/gitaly/main.go b/cmd/gitaly/main.go
index a3addda99..f0b525da2 100644
--- a/cmd/gitaly/main.go
+++ b/cmd/gitaly/main.go
@@ -254,19 +254,20 @@ func run(cfg config.Cfg) error {
}
setup.RegisterAll(srv, &service.Dependencies{
- Cfg: cfg,
- RubyServer: rubySrv,
- GitalyHookManager: hookManager,
- TransactionManager: transactionManager,
- StorageLocator: locator,
- ClientPool: conns,
- GitCmdFactory: gitCmdFactory,
- Linguist: ling,
- CatfileCache: catfileCache,
- DiskCache: diskCache,
- PackObjectsCache: streamCache,
- Git2goExecutor: git2goExecutor,
- UpdaterWithHooks: updaterWithHooks,
+ Cfg: cfg,
+ RubyServer: rubySrv,
+ GitalyHookManager: hookManager,
+ TransactionManager: transactionManager,
+ StorageLocator: locator,
+ ClientPool: conns,
+ GitCmdFactory: gitCmdFactory,
+ Linguist: ling,
+ CatfileCache: catfileCache,
+ DiskCache: diskCache,
+ PackObjectsCache: streamCache,
+ Git2goExecutor: git2goExecutor,
+ UpdaterWithHooks: updaterWithHooks,
+ HousekeepingManager: housekeepingManager,
})
b.RegisterStarter(starter.New(c, srv))
}