You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by fd...@apache.org on 2010/08/21 22:37:28 UTC
svn commit: r987828 - in /couchdb/trunk/src/couchdb:
couch_rep_db_listener.erl couch_work_queue.erl
Author: fdmanana
Date: Sat Aug 21 20:37:28 2010
New Revision: 987828
URL: http://svn.apache.org/viewvc?rev=987828&view=rev
Log:
Fix revision 987824 - add missing changes.
Modified:
couchdb/trunk/src/couchdb/couch_rep_db_listener.erl
couchdb/trunk/src/couchdb/couch_work_queue.erl
Modified: couchdb/trunk/src/couchdb/couch_rep_db_listener.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_rep_db_listener.erl?rev=987828&r1=987827&r2=987828&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_rep_db_listener.erl (original)
+++ couchdb/trunk/src/couchdb/couch_rep_db_listener.erl Sat Aug 21 20:37:28 2010
@@ -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(),
Modified: couchdb/trunk/src/couchdb/couch_work_queue.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_work_queue.erl?rev=987828&r1=987827&r2=987828&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_work_queue.erl (original)
+++ couchdb/trunk/src/couchdb/couch_work_queue.erl Sat Aug 21 20:37:28 2010
@@ -132,7 +132,7 @@ dequeue_items(0, Queue, Blocked, Dequeue
dequeue_items(NumItems, Queue, Blocked, DequeuedAcc) ->
{{value, Item}, Queue2} = queue:out(Queue),
- Blocked2 = case Blocked of
+ case Blocked of
[] ->
Blocked2 = Blocked;
[From | Blocked2] ->