Download as
Browse Code »

Commit 552e42f634fee790a8b6ce8d6655120bb2e69e4f

Authored by Dmitriy Zaporozhets
2 parents ce0ec05c 8a65229b
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #2768 from rlaneve/feature/queued-web-hooks 

Updates web hooks to process via queue
Showing 5 changed files with 16 additions and 3 deletions   Show diff stats
Procfile
  Diff comments   View file @552e42f
1 1 web: bundle exec unicorn_rails -p $PORT
2   -worker: bundle exec sidekiq -q post_receive,mailer,system_hook,common,default
  2 +worker: bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,common,default
... ...
app/models/project.rb
  Diff comments   View file @552e42f
... ... @@ -340,7 +340,7 @@ class Project < ActiveRecord::Base
340 340 end
341 341  
342 342 def execute_hooks(data)
343   - hooks.each { |hook| hook.execute(data) }
  343 + hooks.each { |hook| hook.async_execute(data) }
344 344 end
345 345  
346 346 def execute_services(data)
... ...
app/models/web_hook.rb
  Diff comments   View file @552e42f
... ... @@ -34,4 +34,8 @@ class WebHook < ActiveRecord::Base
34 34 basic_auth: {username: parsed_url.user, password: parsed_url.password})
35 35 end
36 36 end
  37 +
  38 + def async_execute(data)
  39 + Sidekiq::Client.enqueue(ProjectWebHookWorker, id, data)
  40 + end
37 41 end
... ...
app/workers/project_web_hook_worker.rb 0 → 100644
  Diff comments   View file @552e42f
... ... @@ -0,0 +1,9 @@
  1 +class ProjectWebHookWorker
  2 + include Sidekiq::Worker
  3 +
  4 + sidekiq_options queue: :project_web_hook
  5 +
  6 + def perform(hook_id, data)
  7 + WebHook.find(hook_id).execute data
  8 + end
  9 +end
... ...
lib/tasks/sidekiq.rake
  Diff comments   View file @552e42f
... ... @@ -6,7 +6,7 @@ namespace :sidekiq do
6 6  
7 7 desc "GITLAB | Start sidekiq"
8 8 task :start do
9   - run "nohup bundle exec sidekiq -q post_receive,mailer,system_hook,common,default -e #{Rails.env} -P #{pidfile} >> #{Rails.root.join("log", "sidekiq.log")} 2>&1 &"
  9 + run "nohup bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,common,default -e #{Rails.env} -P #{pidfile} >> #{Rails.root.join("log", "sidekiq.log")} 2>&1 &"
10 10 end
11 11  
12 12 def pidfile
... ...