diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
| commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
| tree | fb69158581673816a8cd895f9d352dcb3c678b1e /config/initializers/cluster_events_before_phased_restart.rb | |
| parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'config/initializers/cluster_events_before_phased_restart.rb')
| -rw-r--r-- | config/initializers/cluster_events_before_phased_restart.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/config/initializers/cluster_events_before_phased_restart.rb b/config/initializers/cluster_events_before_phased_restart.rb index d029adbe363..f84682c1436 100644 --- a/config/initializers/cluster_events_before_phased_restart.rb +++ b/config/initializers/cluster_events_before_phased_restart.rb @@ -7,8 +7,6 @@ # # Follow-up the issue: https://gitlab.com/gitlab-org/gitlab/issues/34107 -if Gitlab::Runtime.puma? - Puma::Cluster.prepend(::Gitlab::Cluster::Mixins::PumaCluster) -elsif Gitlab::Runtime.unicorn? - Unicorn::HttpServer.prepend(::Gitlab::Cluster::Mixins::UnicornHttpServer) -end +return unless Gitlab::Runtime.puma? + +Puma::Cluster.prepend(::Gitlab::Cluster::Mixins::PumaCluster) |