From 259680555f8ad79225de0056d646ec8f0d5ed221 Mon Sep 17 00:00:00 2001 From: "Johannes J. Schmidt" Date: Mon, 24 Mar 2014 23:00:55 +0100 Subject: [PATCH] sensible defaults --- README.md | 6 +++--- index.js | 4 ++-- package.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 2b63d84..25c58bb 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Now CouchDB takes care of the couchmagick process. ; Optional username and password, used by the workers to access the database username = mein-user password = secure -; Number of simultaneous changes feeds in parallel. Default is 1. +; Number of simultaneous changes feeds in parallel. Default is 20. ; Increase it to at least the number of your databases, to get best performance. ; If streams is less than the number of databases, all databases will still be queried ; but in intervals of the changes_feed_timeout (see below). You should keep the @@ -55,10 +55,10 @@ concurrency = 1 ; for the usual image resizes, increase it if you deal with really large images and complex ; imagemagick processing. convert_process_timeout = 60000 -; Timeout for changes feed in ms. Default is 10000. See the 'streams' parameter above +; Timeout for changes feed in ms. Default is 60000. See the 'streams' parameter above ; if you have a really large number of databases in your server and cannot afford to ; have a changes feed open to each of them. -changes_feed_timeout = 10000 +changes_feed_timeout = 60000 ; Batch size. This limits the batches the workers will take from the changes feed. ; It basically translates to a limit parameter on the changes feed. Default is 100 limit = 100 diff --git a/index.js b/index.js index ff8569e..9407572 100755 --- a/index.js +++ b/index.js @@ -37,10 +37,10 @@ couchmagick.get({ } // defaults + config.streams = config.streams || 20; config.concurrency = config.concurrency || 1; - config.streams = config.streams || 1; config.limit = config.limit || 100; - config.changes_feed_timeout = config.changes_feed_timeout || 10000; + config.changes_feed_timeout = config.changes_feed_timeout || 60000; config.convert_process_timeout = config.convert_process_timeout || 60000; couchmagick.info('using config ' + JSON.stringify(config).replace(/"password":".*?"/, '"password":"***"')); diff --git a/package.json b/package.json index 41be2a4..7677c20 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "couchmagick", - "version": "1.6.5", + "version": "1.7.0", "description": "Run ImageMagicks `convert` on CouchDB documents.", "main": "index.js", "preferGlobal": true,