From b5d92d5c26804e610a0d9bf00acae4aca712a209 Mon Sep 17 00:00:00 2001 From: dillon Date: Fri, 30 Oct 2015 15:26:18 -0700 Subject: [PATCH] Change 'Slack' back to 'HipChat' in multicore and server. --- multicore.coffee | 2 +- server/hipchat.coffee | 6 +++--- server/payments/payment_handler.coffee | 2 +- server/payments/subscription_handler.coffee | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/multicore.coffee b/multicore.coffee index 6e00b0e72..de179e25e 100644 --- a/multicore.coffee +++ b/multicore.coffee @@ -79,7 +79,7 @@ if cluster.isMaster hipchat = require './server/hipchat' hipchat.sendHipChatMessage(message, ['tower'], {papertrail: true}) catch error - console.log "Couldn't send Slack message on server death:", error + console.log "Couldn't send HipChat message on server death:", error cluster.fork() else require('coffee-script') diff --git a/server/hipchat.coffee b/server/hipchat.coffee index d4732361e..4cb449abf 100644 --- a/server/hipchat.coffee +++ b/server/hipchat.coffee @@ -13,10 +13,10 @@ module.exports.sendHipChatMessage = sendHipChatMessage = (message, rooms, option options ?= {} for room in rooms unless roomID = roomIDMap[room] - log.error "Unknown Slack room #{room}." + log.error "Unknown HipChat room #{room}." continue unless key = config.hipchat[room] - log.info "No Slack API key for room #{room}." + log.info "No HipChat API key for room #{room}." continue form = color: options.color or 'yellow' @@ -32,4 +32,4 @@ module.exports.sendHipChatMessage = sendHipChatMessage = (message, rooms, option url = "https://api.hipchat.com/v2/room/#{roomID}/notification?auth_token=#{key}" request.post {uri: url, json: form}, (err, res, body) -> return log.error 'Error sending Slack message:', err or body if err or /error/i.test body - #log.info "Got Slack message response:", body + #log.info "Got HipChat message response:", body diff --git a/server/payments/payment_handler.coffee b/server/payments/payment_handler.coffee index feb59033e..516a82b59 100644 --- a/server/payments/payment_handler.coffee +++ b/server/payments/payment_handler.coffee @@ -383,6 +383,6 @@ PaymentHandler = class PaymentHandler extends Handler message += " for #{options.payment.get('description')}" if options.payment?.get('description') hipchat.sendHipChatMessage message, ['tower'] catch e - log.error "Couldn't send Slack message on payment because of error: #{e}" + log.error "Couldn't send HipChat message on payment because of error: #{e}" module.exports = new PaymentHandler() diff --git a/server/payments/subscription_handler.coffee b/server/payments/subscription_handler.coffee index 2d674e808..cbd5f0319 100644 --- a/server/payments/subscription_handler.coffee +++ b/server/payments/subscription_handler.coffee @@ -192,7 +192,7 @@ class SubscriptionHandler extends Handler msg = "Year subscription purchased by #{req.user.get('email')} #{req.user.id}" hipchat.sendHipChatMessage msg, ['tower'] catch error - @logSubscriptionError(req.user, "Year sub sale Slack tower msg error: #{JSON.stringify(error)}") + @logSubscriptionError(req.user, "Year sub sale HipChat tower msg error: #{JSON.stringify(error)}") @sendSuccess(res, user) subscribeWithPrepaidCode: (req, res) ->