mirror of
https://github.com/django-q2/django-q2.git
synced 2026-10-04 10:18:11 +08:00
consolidated redis ping
This commit is contained in:
+2
-6
@@ -33,16 +33,11 @@ import tasks
|
|||||||
|
|
||||||
from django_q.conf import Conf, redis_client, logger, psutil
|
from django_q.conf import Conf, redis_client, logger, psutil
|
||||||
from django_q.models import Task, Success, Schedule
|
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):
|
class Cluster(object):
|
||||||
def __init__(self, list_key=Conf.Q_LIST):
|
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.sentinel = None
|
||||||
self.stop_event = None
|
self.stop_event = None
|
||||||
self.start_event = None
|
self.start_event = None
|
||||||
@@ -136,6 +131,7 @@ class Sentinel(object):
|
|||||||
self.start()
|
self.start()
|
||||||
|
|
||||||
def start(self):
|
def start(self):
|
||||||
|
ping_redis(self.r)
|
||||||
self.spawn_cluster()
|
self.spawn_cluster()
|
||||||
self.guard()
|
self.guard()
|
||||||
|
|
||||||
|
|||||||
+1
-3
@@ -278,7 +278,5 @@ def ping_redis(r):
|
|||||||
try:
|
try:
|
||||||
r.ping()
|
r.ping()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
term = Terminal()
|
logger.error('Can not connect to Redis server.')
|
||||||
print(term.red('Can not connect to Redis server.'))
|
|
||||||
logger.exception(e)
|
|
||||||
raise e
|
raise e
|
||||||
|
|||||||
Reference in New Issue
Block a user