From 705c4e51224c17224d05cf43640b9fc375622483 Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Fri, 27 Nov 2015 03:06:32 +0100 Subject: [PATCH 1/2] change from using notifier based queues to using `notifications` for notifications sent by travis-tasks and `live-updates` for updates sent by travis-live --- lib/travis/addons/handlers/campfire.rb | 2 +- lib/travis/addons/handlers/email.rb | 2 +- lib/travis/addons/handlers/flowdock.rb | 3 +-- lib/travis/addons/handlers/github_status.rb | 2 +- lib/travis/addons/handlers/hipchat.rb | 2 +- lib/travis/addons/handlers/irc.rb | 3 +-- lib/travis/addons/handlers/pusher.rb | 2 +- lib/travis/addons/handlers/pushover.rb | 2 +- lib/travis/addons/handlers/slack.rb | 3 +-- lib/travis/addons/handlers/sqwiggle.rb | 3 +-- lib/travis/addons/handlers/webhook.rb | 3 +-- lib/travis/addons/helpers/task.rb | 10 ++++++---- spec/travis/addons/handlers/campfire_spec.rb | 2 +- spec/travis/addons/handlers/email_spec.rb | 2 +- spec/travis/addons/handlers/flowdock_spec.rb | 2 +- spec/travis/addons/handlers/github_status_spec.rb | 2 +- spec/travis/addons/handlers/hipchat_spec.rb | 2 +- spec/travis/addons/handlers/irc_spec.rb | 2 +- spec/travis/addons/handlers/pushover_spec.rb | 2 +- spec/travis/addons/handlers/slack_spec.rb | 2 +- spec/travis/addons/handlers/sqwiggle_spec.rb | 2 +- spec/travis/addons/handlers/webhook_spec.rb | 2 +- 22 files changed, 27 insertions(+), 30 deletions(-) diff --git a/lib/travis/addons/handlers/campfire.rb b/lib/travis/addons/handlers/campfire.rb index 13d640b1a..091ea175e 100644 --- a/lib/travis/addons/handlers/campfire.rb +++ b/lib/travis/addons/handlers/campfire.rb @@ -11,7 +11,7 @@ def handle? end def handle - run_task(:campfire, payload, targets: targets) + run_task(payload, targets: targets) end def targets diff --git a/lib/travis/addons/handlers/email.rb b/lib/travis/addons/handlers/email.rb index e40890a19..3258a14f8 100644 --- a/lib/travis/addons/handlers/email.rb +++ b/lib/travis/addons/handlers/email.rb @@ -12,7 +12,7 @@ def handle? end def handle - run_task(:email, payload, recipients: recipients, broadcasts: broadcasts) + run_task(payload, recipients: recipients, broadcasts: broadcasts) end def recipients diff --git a/lib/travis/addons/handlers/flowdock.rb b/lib/travis/addons/handlers/flowdock.rb index 2a41438b7..249eed2fb 100644 --- a/lib/travis/addons/handlers/flowdock.rb +++ b/lib/travis/addons/handlers/flowdock.rb @@ -11,7 +11,7 @@ def handle? end def handle - run_task(:flowdock, payload, targets: targets) + run_task(payload, targets: targets) end def targets @@ -28,4 +28,3 @@ def notify_completed end end end - diff --git a/lib/travis/addons/handlers/github_status.rb b/lib/travis/addons/handlers/github_status.rb index 9e4849016..3b3e2f751 100644 --- a/lib/travis/addons/handlers/github_status.rb +++ b/lib/travis/addons/handlers/github_status.rb @@ -12,7 +12,7 @@ def handle? end def handle - run_task(:github_status, payload, tokens: tokens) + run_task(payload, tokens: tokens) end private diff --git a/lib/travis/addons/handlers/hipchat.rb b/lib/travis/addons/handlers/hipchat.rb index b01a587c4..49ac00ec1 100644 --- a/lib/travis/addons/handlers/hipchat.rb +++ b/lib/travis/addons/handlers/hipchat.rb @@ -11,7 +11,7 @@ def handle? end def handle - run_task(:hipchat, payload, targets: targets) + run_task(payload, targets: targets) end def enabled? diff --git a/lib/travis/addons/handlers/irc.rb b/lib/travis/addons/handlers/irc.rb index 5539a58fa..879ccc3da 100644 --- a/lib/travis/addons/handlers/irc.rb +++ b/lib/travis/addons/handlers/irc.rb @@ -11,7 +11,7 @@ def handle? end def handle - run_task(:irc, payload, channels: channels) + run_task(payload, channels: channels) end def channels @@ -28,4 +28,3 @@ def notify_completed end end end - diff --git a/lib/travis/addons/handlers/pusher.rb b/lib/travis/addons/handlers/pusher.rb index 8791583a5..428d91094 100644 --- a/lib/travis/addons/handlers/pusher.rb +++ b/lib/travis/addons/handlers/pusher.rb @@ -11,7 +11,7 @@ class Pusher < Base /^build:(created|received|started|finished|canceled|restarted)/, /^job:(created|received|started|finished|canceled|restarted)/ ] - QUEUE = :'pusher-live' + QUEUE = :'live-updates' attr_reader :channels diff --git a/lib/travis/addons/handlers/pushover.rb b/lib/travis/addons/handlers/pushover.rb index 9678030c6..16ab0deea 100644 --- a/lib/travis/addons/handlers/pushover.rb +++ b/lib/travis/addons/handlers/pushover.rb @@ -11,7 +11,7 @@ def handle? end def handle - run_task(:pushover, payload, users: users, api_key: api_key) + run_task(payload, users: users, api_key: api_key) end def users diff --git a/lib/travis/addons/handlers/slack.rb b/lib/travis/addons/handlers/slack.rb index 5afe3cbea..ae8e88ea3 100644 --- a/lib/travis/addons/handlers/slack.rb +++ b/lib/travis/addons/handlers/slack.rb @@ -11,7 +11,7 @@ def handle? end def handle - run_task(:slack, payload, targets: targets) + run_task(payload, targets: targets) end def targets @@ -28,4 +28,3 @@ def notify_completed end end end - diff --git a/lib/travis/addons/handlers/sqwiggle.rb b/lib/travis/addons/handlers/sqwiggle.rb index c9de99bb8..442ffc545 100644 --- a/lib/travis/addons/handlers/sqwiggle.rb +++ b/lib/travis/addons/handlers/sqwiggle.rb @@ -11,7 +11,7 @@ def handle? end def handle - run_task(:sqwiggle, payload, targets: targets) + run_task(payload, targets: targets) end def targets @@ -28,4 +28,3 @@ def notify_completed end end end - diff --git a/lib/travis/addons/handlers/webhook.rb b/lib/travis/addons/handlers/webhook.rb index 05cedbd64..496d9fbae 100644 --- a/lib/travis/addons/handlers/webhook.rb +++ b/lib/travis/addons/handlers/webhook.rb @@ -12,7 +12,7 @@ def handle? end def handle - run_task(:webhook, payload, targets: targets, token: request.token) + run_task(payload, targets: targets, token: request.token) end def targets @@ -35,4 +35,3 @@ def notify_completed end end end - diff --git a/lib/travis/addons/helpers/task.rb b/lib/travis/addons/helpers/task.rb index 18c670460..216c98b3d 100644 --- a/lib/travis/addons/helpers/task.rb +++ b/lib/travis/addons/helpers/task.rb @@ -30,14 +30,16 @@ def tags include Coder - def run_task(queue, *args) + QUEUE = :'notifications' + + def run_task(*args) target = "Travis::Addons::#{self.class.name.split('::').last}::Task" args = deep_clean_strings(args) ::Sidekiq::Client.push( - 'queue' => queue, - 'class' => 'Travis::Async::Sidekiq::Worker', - 'args' => [nil, target, 'perform', *args] + 'queue' => QUEUE, + 'class' => 'Travis::Async::Sidekiq::Worker', + 'args' => [nil, target, 'perform', *args] ) rescue => e Exceptions.handle(Error.new(e, queue, args)) # TODO pass in diff --git a/spec/travis/addons/handlers/campfire_spec.rb b/spec/travis/addons/handlers/campfire_spec.rb index 1a6ce6011..9d5f76528 100644 --- a/spec/travis/addons/handlers/campfire_spec.rb +++ b/spec/travis/addons/handlers/campfire_spec.rb @@ -51,7 +51,7 @@ describe 'handle' do it 'enqueues a task' do - handler.expects(:run_task).with(:campfire, is_a(Hash), targets: ['room']) + handler.expects(:run_task).with(is_a(Hash), targets: ['room']) handler.handle end end diff --git a/spec/travis/addons/handlers/email_spec.rb b/spec/travis/addons/handlers/email_spec.rb index 25ca446b3..7e2306586 100644 --- a/spec/travis/addons/handlers/email_spec.rb +++ b/spec/travis/addons/handlers/email_spec.rb @@ -63,7 +63,7 @@ let(:recipient) { 'me@email.com' } it 'enqueues a task' do - handler.expects(:run_task).with(:email, is_a(Hash), recipients: [recipient], broadcasts: [{ message: 'message' }]) + handler.expects(:run_task).with(is_a(Hash), recipients: [recipient], broadcasts: [{ message: 'message' }]) handler.handle end end diff --git a/spec/travis/addons/handlers/flowdock_spec.rb b/spec/travis/addons/handlers/flowdock_spec.rb index 5087c7cc8..a4a0b98a9 100644 --- a/spec/travis/addons/handlers/flowdock_spec.rb +++ b/spec/travis/addons/handlers/flowdock_spec.rb @@ -51,7 +51,7 @@ describe 'handle' do it 'enqueues a task' do - handler.expects(:run_task).with(:flowdock, is_a(Hash), targets: ['room']) + handler.expects(:run_task).with(is_a(Hash), targets: ['room']) handler.handle end end diff --git a/spec/travis/addons/handlers/github_status_spec.rb b/spec/travis/addons/handlers/github_status_spec.rb index f2f01f7da..b86419c0c 100644 --- a/spec/travis/addons/handlers/github_status_spec.rb +++ b/spec/travis/addons/handlers/github_status_spec.rb @@ -45,7 +45,7 @@ before { permissions.create(user: admin, admin: true) } it 'enqueues a task' do - handler.expects(:run_task).with(:github_status, is_a(Hash), tokens: { 'admin' => 'admin-token' }) + handler.expects(:run_task).with(is_a(Hash), tokens: { 'admin' => 'admin-token' }) handler.handle end end diff --git a/spec/travis/addons/handlers/hipchat_spec.rb b/spec/travis/addons/handlers/hipchat_spec.rb index 5b4234d19..5e504c78a 100644 --- a/spec/travis/addons/handlers/hipchat_spec.rb +++ b/spec/travis/addons/handlers/hipchat_spec.rb @@ -57,7 +57,7 @@ describe 'handle' do it 'enqueues a task' do - handler.expects(:run_task).with(:hipchat, is_a(Hash), targets: ['room']) + handler.expects(:run_task).with(is_a(Hash), targets: ['room']) handler.handle end end diff --git a/spec/travis/addons/handlers/irc_spec.rb b/spec/travis/addons/handlers/irc_spec.rb index 8cd5ca83a..6a7afbcb8 100644 --- a/spec/travis/addons/handlers/irc_spec.rb +++ b/spec/travis/addons/handlers/irc_spec.rb @@ -51,7 +51,7 @@ describe 'handle' do it 'enqueues a task' do - handler.expects(:run_task).with(:irc, is_a(Hash), channels: ['channel']) + handler.expects(:run_task).with(is_a(Hash), channels: ['channel']) handler.handle end end diff --git a/spec/travis/addons/handlers/pushover_spec.rb b/spec/travis/addons/handlers/pushover_spec.rb index 9c0a38a6f..cb94eef87 100644 --- a/spec/travis/addons/handlers/pushover_spec.rb +++ b/spec/travis/addons/handlers/pushover_spec.rb @@ -51,7 +51,7 @@ describe 'handle' do it 'enqueues a task' do - handler.expects(:run_task).with(:pushover, is_a(Hash), users: ['user'], api_key: 'api_key') + handler.expects(:run_task).with(is_a(Hash), users: ['user'], api_key: 'api_key') handler.handle end end diff --git a/spec/travis/addons/handlers/slack_spec.rb b/spec/travis/addons/handlers/slack_spec.rb index d124b17b2..c79338a41 100644 --- a/spec/travis/addons/handlers/slack_spec.rb +++ b/spec/travis/addons/handlers/slack_spec.rb @@ -51,7 +51,7 @@ describe 'handle' do it 'enqueues a task' do - handler.expects(:run_task).with(:slack, is_a(Hash), targets: ['room']) + handler.expects(:run_task).with(is_a(Hash), targets: ['room']) handler.handle end end diff --git a/spec/travis/addons/handlers/sqwiggle_spec.rb b/spec/travis/addons/handlers/sqwiggle_spec.rb index a04b8a453..2120c7bc4 100644 --- a/spec/travis/addons/handlers/sqwiggle_spec.rb +++ b/spec/travis/addons/handlers/sqwiggle_spec.rb @@ -51,7 +51,7 @@ describe 'handle' do it 'enqueues a task' do - handler.expects(:run_task).with(:sqwiggle, is_a(Hash), targets: ['room']) + handler.expects(:run_task).with(is_a(Hash), targets: ['room']) handler.handle end end diff --git a/spec/travis/addons/handlers/webhook_spec.rb b/spec/travis/addons/handlers/webhook_spec.rb index 75493e81f..045b0ae47 100644 --- a/spec/travis/addons/handlers/webhook_spec.rb +++ b/spec/travis/addons/handlers/webhook_spec.rb @@ -41,7 +41,7 @@ describe 'handle' do it 'enqueues a task' do - handler.expects(:run_task).with(:webhook, is_a(Hash), targets: ['http://host.com/target'], token: 'token') + handler.expects(:run_task).with(is_a(Hash), targets: ['http://host.com/target'], token: 'token') handler.handle end end From b8392676ca6de7e7841b685012cb637569b03b9d Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Fri, 27 Nov 2015 14:08:28 +0100 Subject: [PATCH 2/2] fix a spec for the live updates queue --- spec/travis/addons/handlers/pusher_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/travis/addons/handlers/pusher_spec.rb b/spec/travis/addons/handlers/pusher_spec.rb index dfed0007d..9b7d34908 100644 --- a/spec/travis/addons/handlers/pusher_spec.rb +++ b/spec/travis/addons/handlers/pusher_spec.rb @@ -35,7 +35,7 @@ it 'enqueues a task' do ::Sidekiq::Client.expects(:push).with do |payload| - expect(payload['queue']).to eq(:'pusher-live') + expect(payload['queue']).to eq(:'live-updates') expect(payload['class']).to eq('Travis::Async::Sidekiq::Worker') expect(payload['method']).to eq('perform') expect(payload['args'][3]).to be_a(Hash) @@ -50,7 +50,7 @@ it 'enqueues a task' do ::Sidekiq::Client.expects(:push).with do |payload| - expect(payload['queue']).to eq(:'pusher-live') + expect(payload['queue']).to eq(:'live-updates') expect(payload['class']).to eq('Travis::Async::Sidekiq::Worker') expect(payload['method']).to eq('perform') expect(payload['args'][3]).to be_a(Hash)