From 49d115e263de1cdb2326e691a566d0d230110d21 Mon Sep 17 00:00:00 2001 From: Filipe David Borba Manana Date: Sat, 21 Aug 2010 20:37:28 +0000 Subject: Fix revision 987824 - add missing changes. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@987828 13f79535-47bb-0310-9956-ffa450edef68 --- src/couchdb/couch_rep_db_listener.erl | 3 ++- src/couchdb/couch_work_queue.erl | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/couchdb/couch_rep_db_listener.erl b/src/couchdb/couch_rep_db_listener.erl index bc407693..926b2987 100644 --- a/src/couchdb/couch_rep_db_listener.erl +++ b/src/couchdb/couch_rep_db_listener.erl @@ -33,7 +33,8 @@ start_link() -> init(_) -> process_flag(trap_exit, true), - {ok, Queue} = couch_work_queue:new(1024 * 1024, 1000), + {ok, Queue} = couch_work_queue:new( + [{max_size, 1024 * 1024}, {max_items, 1000}]), {ok, Processor} = changes_processor(Queue), {ok, Loop} = changes_feed_loop(Queue), Server = self(), diff --git a/src/couchdb/couch_work_queue.erl b/src/couchdb/couch_work_queue.erl index 07fab2cc..13ec7335 100644 --- a/src/couchdb/couch_work_queue.erl +++ b/src/couchdb/couch_work_queue.erl @@ -132,7 +132,7 @@ dequeue_items(0, Queue, Blocked, DequeuedAcc) -> dequeue_items(NumItems, Queue, Blocked, DequeuedAcc) -> {{value, Item}, Queue2} = queue:out(Queue), - Blocked2 = case Blocked of + case Blocked of [] -> Blocked2 = Blocked; [From | Blocked2] -> -- cgit v1.2.3