From 63571cd02177d871f6ac9be3b95df065ec1f802b Mon Sep 17 00:00:00 2001 From: Trever Fischer Date: Sat, 17 Nov 2012 16:06:46 -0500 Subject: [PATCH] Allow poll clients to know if we are using beanstalkd or not --- api/handlers.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/api/handlers.py b/api/handlers.py index 591bbc3..ff28600 100644 --- a/api/handlers.py +++ b/api/handlers.py @@ -96,7 +96,7 @@ class ServerEventHandler(BaseHandler): job.bury() events.append({'id': job.jid, 'event': json.loads(job.body)}) job = queue.reserve(timeout=0) - return {'events': events} + return {'events': events, 'is-live': settings.CAMINUS_USE_BEANSTALKD} def create(self, request): queue = server_queue(request.server) @@ -144,6 +144,7 @@ class PollHandler(BaseHandler): cachePlayerList() pollData = {'server-info': {}, 'user-info': {}} pollData['server-info'] = cache.get('caminus-server-info') + pollData['is-live'] = settings.CAMINUS_USE_BEANSTALKD if not request.user.is_anonymous(): pollData['user-info']['balance'] = request.user.minecraftprofile.currencyaccount.balance pollData['events'] = [] @@ -155,7 +156,7 @@ class PollHandler(BaseHandler): latestEvents = [] for e in latestEvents: pollData['events'].append(json.loads(e)) - else: + elif settings.CAMINUS_USE_BEANSTALKD: eventQueue = web_queue(timestamp) event = eventQueue.reserve(timeout=30) if event: