paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 15:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[manual] Use ujson instead of simplejson.

Browse Source 
This saves something like 15ms on our 1000 message get_old_messages
queries, and will save even more when we start sending JSON dumps into
our memcached system.

We need to install python-ujson on servers and dev instances before
pushing this to prod.

(imported from commit 373690b7c056d00d2299a7588a33f025104bfbca)
This commit is contained in:
Tim Abbott
2013-06-18 17:55:55 -04:00
parent 678dd502ef
commit 222ef672b5
25 changed files with 120 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zephyr/lib/event_queue.py
View File

@@ -6,7 +6,7 @@ import os
import time
import socket
import logging
import simplejson
import ujson
import requests
import cPickle as pickle
import atexit
@@ -247,11 +247,11 @@ def request_event_queue(user_profile, user_client, apply_markdown,
event_types=None):
if settings.TORNADO_SERVER:
req = {'dont_block' : 'true',
'apply_markdown': simplejson.dumps(apply_markdown),
'apply_markdown': ujson.dumps(apply_markdown),
'client' : 'internal',
'user_client' : user_client.name}
if event_types is not None:
req['event_types'] = simplejson.dumps(event_types)
req['event_types'] = ujson.dumps(event_types)
resp = requests.get(settings.TORNADO_SERVER + '/api/v1/events',
auth=requests.auth.HTTPBasicAuth(user_profile.email,
user_profile.api_key),