From 3838b0341778da05fd7f00a6c3eb4b366b1279ea Mon Sep 17 00:00:00 2001 From: Alex DeBrie Date: Wed, 16 Mar 2016 20:26:21 +0000 Subject: [PATCH] Clean up tasks.py to remove unneeded code --- redash/tasks.py | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/redash/tasks.py b/redash/tasks.py index 5f30c16b9..5cabaa058 100644 --- a/redash/tasks.py +++ b/redash/tasks.py @@ -4,14 +4,11 @@ import logging import signal from flask_mail import Message import redis -import hipchat -import requests -from redash.utils import json_dumps, base_url -from requests.auth import HTTPBasicAuth +from redash.utils import base_url from celery import Task from celery.result import AsyncResult from celery.utils.log import get_task_logger -from redash import redis_connection, models, statsd_client, settings, utils, mail +from redash import redis_connection, models, statsd_client, settings, utils from redash.utils import gen_query_hash from redash.worker import celery from redash.query_runner import InterruptException @@ -369,18 +366,6 @@ def check_alerts_for_query(self, query_id): logger.warn("Exception: {}".format(e)) -def notify_hipchat(alert, html, new_state): - try: - if settings.HIPCHAT_API_URL: - hipchat_client = hipchat.HipChat(token=settings.HIPCHAT_API_TOKEN, url=settings.HIPCHAT_API_URL) - else: - hipchat_client = hipchat.HipChat(token=settings.HIPCHAT_API_TOKEN) - message = '[' + new_state.upper() + '] ' + alert.name + '
' + html - hipchat_client.message_room(settings.HIPCHAT_ROOM_ID, settings.NAME, message.encode('utf-8', 'ignore'), message_format='html') - except Exception: - logger.exception("hipchat send ERROR.") - - @celery.task(base=BaseTask) def send_mail(to, subject, html, text): from redash.wsgi import app