public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into ios7

Browse source 
* master:
  Better limit on redis logging.
  Fixing persistance of redis keys due to redis' RESTORE command using a millisecond TTL, not a second TTL.
  Fixing redis issues by pipelining.
This commit is contained in:
Samuel Clay 2013-10-08 11:48:44 -07:00
commit 6bd1eba14d
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/reader/models.py
View file

@ -197,8 +197,10 @@ class UserSubscription(models.Model):
dump = r.dump(unread_ranked_stories_key) dump = r.dump(unread_ranked_stories_key)
if dump: if dump:
rt.delete(unread_ranked_stories_key) pipeline = rt.pipeline()
rt.restore(unread_ranked_stories_key, 1*60*60, dump) pipeline.delete(unread_ranked_stories_key)
pipeline.restore(unread_ranked_stories_key, 1*60*60*1000, dump)
pipeline.execute()
r.delete(unread_ranked_stories_key) r.delete(unread_ranked_stories_key)
current_time = int(time.time() + 60*60*24) current_time = int(time.time() + 60*60*24)

10
utils/redis_raw_log_middleware.py
View file

@ -45,5 +45,11 @@ class RedisDumpMiddleware(object):
return instrumented_method return instrumented_method
def process_message(self, *args, **kwargs): def process_message(self, *args, **kwargs):
query = ' '.join([str(arg) for arg in args if not isinstance(arg, Connection)]) query = []
return { 'query': query, } for a, arg in enumerate(args):
if isinstance(arg, Connection):
continue
if len(str(arg)) > 100:
arg = "[%s bytes]" % len(arg)
query.append(str(arg).replace('\n', ''))
return { 'query': ' '.join(query) }