diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-19 23:18:09 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-19 23:18:09 +0000 |
| commit | 6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde (patch) | |
| tree | dc4d20fe6064752c0bd323187252c77e0a89144b /workhorse/main.go | |
| parent | 9868dae7fc0655bd7ce4a6887d4e6d487690eeed (diff) | |
| download | gitlab-ce-6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42
Diffstat (limited to 'workhorse/main.go')
| -rw-r--r-- | workhorse/main.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/workhorse/main.go b/workhorse/main.go index 91008e16961..b0f9760b0d5 100644 --- a/workhorse/main.go +++ b/workhorse/main.go @@ -220,9 +220,10 @@ func run(boot bootConfig, cfg config.Config) error { secret.SetPath(boot.secretPath) + keyWatcher := redis.NewKeyWatcher() if cfg.Redis != nil { redis.Configure(cfg.Redis, redis.DefaultDialFunc) - go redis.Process() + go keyWatcher.Process() } if err := cfg.RegisterGoCloudURLOpeners(); err != nil { @@ -237,7 +238,7 @@ func run(boot bootConfig, cfg config.Config) error { gitaly.InitializeSidechannelRegistry(accessLogger) - up := wrapRaven(upstream.NewUpstream(cfg, accessLogger)) + up := wrapRaven(upstream.NewUpstream(cfg, accessLogger, keyWatcher.WatchKey)) done := make(chan os.Signal, 1) signal.Notify(done, syscall.SIGINT, syscall.SIGTERM) @@ -271,7 +272,7 @@ func run(boot bootConfig, cfg config.Config) error { ctx, cancel := context.WithTimeout(context.Background(), cfg.ShutdownTimeout.Duration) // lint:allow context.Background defer cancel() - redis.Shutdown() + keyWatcher.Shutdown() return srv.Shutdown(ctx) } } |