4 files changed, 19 insertions, 38 deletions
diff --git a/app/workers/build_email_worker.rb b/app/workers/build_email_worker.rb
new file mode 100644
index 00000000000..1c7a04a66a8
--- /dev/null
+++ b/app/workers/build_email_worker.rb
@@ -0,0 +1,19 @@
+class BuildEmailWorker
+  include Sidekiq::Worker
+
+  def perform(build_id, recipients, push_data)
+    recipients.each do |recipient|
+      begin
+        case push_data['build_status']
+        when 'success'
+          Notify.build_success_email(build_id, recipient).deliver_now
+        when 'failed'
+          Notify.build_fail_email(build_id, recipient).deliver_now
+        end
+      # These are input errors and won't be corrected even if Sidekiq retries
+      rescue Net::SMTPFatalError, Net::SMTPSyntaxError => e
+        logger.info("Failed to send e-mail for project '#{push_data['project_name']}' to #{recipient}: #{e}")
+      end
+    end
+  end
+end
diff --git a/app/workers/ci/hip_chat_notifier_worker.rb b/app/workers/ci/hip_chat_notifier_worker.rb
deleted file mode 100644
index ebb43570e2a..00000000000
--- a/app/workers/ci/hip_chat_notifier_worker.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-module Ci
-  class HipChatNotifierWorker
-    include Sidekiq::Worker
-
-    def perform(message, options={})
-      room   = options.delete('room')
-      token  = options.delete('token')
-      server = options.delete('server')
-      name   = options.delete('service_name')
-      client_opts = {
-        api_version: 'v2',
-        server_url: server
-      }
-
-      client = HipChat::Client.new(token, client_opts)
-      client[room].send(name, message, options.symbolize_keys)
-    end
-  end
-end
diff --git a/app/workers/ci/slack_notifier_worker.rb b/app/workers/ci/slack_notifier_worker.rb
deleted file mode 100644
index 3bbb9b4bec7..00000000000
--- a/app/workers/ci/slack_notifier_worker.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module Ci
-  class SlackNotifierWorker
-    include Sidekiq::Worker
-
-    def perform(webhook_url, message, options={})
-      notifier = Slack::Notifier.new(webhook_url)
-      notifier.ping(message, options)
-    end
-  end
-end
diff --git a/app/workers/ci/web_hook_worker.rb b/app/workers/ci/web_hook_worker.rb
deleted file mode 100644
index 0bb83845572..00000000000
--- a/app/workers/ci/web_hook_worker.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Ci
-  class WebHookWorker
-    include Sidekiq::Worker
-
-    def perform(hook_id, data)
-      Ci::WebHook.find(hook_id).execute data
-    end
-  end
-end