Allow poll clients to know if we are using beanstalkd or not

This commit is contained in:
Trever Fischer
2012-11-17 16:06:46 -05:00
parent 4b9b53e9da
commit 63571cd021

View File

@@ -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: