diff options
| author | Justin Tobler <jtobler@gitlab.com> | 2023-03-17 02:02:38 +0300 |
|---|---|---|
| committer | Justin Tobler <jtobler@gitlab.com> | 2023-03-17 02:02:38 +0300 |
| commit | 534e1a1c783059ab7a24ede2c63a53867ba393a2 (patch) | |
| tree | fe140562a0fe9babb3ad7ce21d1b1212874c500a | |
| parent | 13831d6322618ae3913485d3aced363b820ba8d8 (diff) | |
| parent | 725bc10c676c42d23c50b4dba7eb970de9f345b9 (diff) | |
Merge branch 'toon-no-moar-gitaly-ruby-start' into 'master'
gitaly: Do not start gitaly-ruby
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5497
Merged-by: Justin Tobler <jtobler@gitlab.com>
Approved-by: Will Chandler <wchandler@gitlab.com>
Approved-by: Justin Tobler <jtobler@gitlab.com>
Co-authored-by: Toon Claes <toon@gitlab.com>
| -rw-r--r-- | internal/cli/gitaly/serve.go | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/internal/cli/gitaly/serve.go b/internal/cli/gitaly/serve.go index 7bdf7560f..697fd1437 100644 --- a/internal/cli/gitaly/serve.go +++ b/internal/cli/gitaly/serve.go @@ -31,7 +31,6 @@ import ( "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/config/sentry" "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/hook" "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/maintenance" - "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/rubyserver" "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/server" "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/service" "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/service/setup" @@ -304,12 +303,6 @@ func run(cfg config.Cfg) error { updaterWithHooks := updateref.NewUpdaterWithHooks(cfg, locator, hookManager, gitCmdFactory, catfileCache) - rubySrv := rubyserver.New(cfg, gitCmdFactory) - if err := rubySrv.Start(); err != nil { - return fmt.Errorf("initialize gitaly-ruby: %w", err) - } - defer rubySrv.Stop() - streamCache := streamcache.New(cfg.PackObjectsCache, glog.Default()) concurrencyTracker := hook.NewConcurrencyTracker() prometheus.MustRegister(concurrencyTracker) @@ -339,7 +332,6 @@ func run(cfg config.Cfg) error { setup.RegisterAll(srv, &service.Dependencies{ Cfg: cfg, - RubyServer: rubySrv, GitalyHookManager: hookManager, TransactionManager: transactionManager, StorageLocator: locator, |