From ac2dc02b4ca2dd388e4391f1f9b9bd700bdf4acd Mon Sep 17 00:00:00 2001
From: Ilan <koed00@gmail.com>
Date: Mon, 17 Aug 2015 14:25:32 +0200
Subject: [PATCH] consolidated redis ping

---
 django_q/cluster.py | 8 ++------
 django_q/monitor.py | 4 +---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/django_q/cluster.py b/django_q/cluster.py
index c1ed4e9..bd3db19 100644
--- a/django_q/cluster.py
+++ b/django_q/cluster.py
@@ -33,16 +33,11 @@ import tasks
 
 from django_q.conf import Conf, redis_client, logger, psutil
 from django_q.models import Task, Success, Schedule
-from django_q.monitor import Status, Stat
+from django_q.monitor import Status, Stat, ping_redis
 
 
 class Cluster(object):
     def __init__(self, list_key=Conf.Q_LIST):
-        try:
-            redis_client.ping()
-        except Exception as e:
-            logger.exception(e)
-            raise e
         self.sentinel = None
         self.stop_event = None
         self.start_event = None
@@ -136,6 +131,7 @@ class Sentinel(object):
             self.start()
 
     def start(self):
+        ping_redis(self.r)
         self.spawn_cluster()
         self.guard()
 
diff --git a/django_q/monitor.py b/django_q/monitor.py
index 3cbb23d..80fbb34 100644
--- a/django_q/monitor.py
+++ b/django_q/monitor.py
@@ -278,7 +278,5 @@ def ping_redis(r):
     try:
         r.ping()
     except Exception as e:
-        term = Terminal()
-        print(term.red('Can not connect to Redis server.'))
-        logger.exception(e)
+        logger.error('Can not connect to Redis server.')
         raise e