summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2018-10-23 16:38:45 +0200
committerJacob Vosmaer <jacob@gitlab.com>2018-10-23 16:38:45 +0200
commit8e298412be7fc9de34fac8bd87d146e8184d0309 (patch)
treec02f8cb2ae7979fd31cbf26e78056d9a55bc97bd
parent63d8505d2ce3909493272f446026786a011bd86e (diff)
downloadgitlab-ce-jv-clarify-lifecycle-events.tar.gz
Rename listeners to hooksjv-clarify-lifecycle-events
-rw-r--r--lib/gitlab/cluster/lifecycle_events.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/gitlab/cluster/lifecycle_events.rb b/lib/gitlab/cluster/lifecycle_events.rb
index b31d2ba5861..743c8885ed1 100644
--- a/lib/gitlab/cluster/lifecycle_events.rb
+++ b/lib/gitlab/cluster/lifecycle_events.rb
@@ -24,7 +24,7 @@ module Gitlab
def on_worker_start(&block)
if in_clustered_environment?
# Defer block execution
- (@worker_start_listeners ||= []) << block
+ (@worker_start_hooks ||= []) << block
else
block.call
end
@@ -33,7 +33,7 @@ module Gitlab
def on_before_fork(&block)
if in_clustered_environment?
# Defer block execution
- (@before_fork_listeners ||= []) << block
+ (@before_fork_hooks ||= []) << block
else
# Discard block
end
@@ -42,7 +42,7 @@ module Gitlab
def on_master_restart(&block)
if in_clustered_environment?
# Defer block execution
- (@master_restart_listeners ||= []) << block
+ (@master_restart_hooks ||= []) << block
else
# Discard block
end
@@ -52,19 +52,19 @@ module Gitlab
# Lifecycle integration methods (called from unicorn.rb, puma.rb, etc.)
#
def do_worker_start
- @worker_start_listeners&.each do |block|
+ @worker_start_hooks&.each do |block|
block.call
end
end
def do_before_fork
- @before_fork_listeners&.each do |block|
+ @before_fork_hooks&.each do |block|
block.call
end
end
def do_master_restart
- @master_restart_listeners && @master_restart_listeners.each do |block|
+ @master_restart_hooks && @master_restart_hooks.each do |block|
block.call
end
end