paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-23 07:52:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move HTTPResponse construction out of event_queue.py.

Browse Source
This commit is contained in:
Tim Abbott
2014-01-28 13:04:24 -05:00
committed by Tim Abbott
parent a9bf4b4cc7
commit f6073d1708
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zerver/lib/event_queue.py
View File

@@ -27,7 +27,6 @@ from zerver.middleware import async_request_restart
from zerver.models import get_client, Message from zerver.models import get_client, Message
from zerver.lib.narrow import build_narrow_filter from zerver.lib.narrow import build_narrow_filter
from zerver.lib.queue import queue_json_publish from zerver.lib.queue import queue_json_publish
from zerver.lib.response import json_success, json_error
from zerver.lib.timestamp import timestamp_to_datetime from zerver.lib.timestamp import timestamp_to_datetime
import copy import copy
@@ -477,7 +476,7 @@ def fetch_events(user_profile_id, user_profile_realm_id, user_profile_email,
extra_log_data = "[%s/%s]" % (queue_id, len(ret["events"])) extra_log_data = "[%s/%s]" % (queue_id, len(ret["events"]))
if was_connected: if was_connected:
extra_log_data += " [was connected]" extra_log_data += " [was connected]"
return (json_success(ret), extra_log_data) return (ret, extra_log_data)
if was_connected: if was_connected:
logging.info("Disconnected handler for queue %s (%s/%s)" % (queue_id, user_profile_email, logging.info("Disconnected handler for queue %s (%s/%s)" % (queue_id, user_profile_email,

3
zerver/tornadoviews.py
View File

@@ -62,4 +62,5 @@ def get_events_backend(request, user_profile, handler,
request._log_data['extra'] = log_data request._log_data['extra'] = log_data
if result == RespondAsynchronously: if result == RespondAsynchronously:
handler._request = request handler._request = request
return result return result
return json_success(result)