configurable convert timeout

README.md

@@ -35,8 +35,10 @@ password = secure
 streams = 8
 ; Concurrency level (number of simultanous convert processes). Default is 1
 concurrency = 8
-; Timeout in ms. Default is 10000
-timeout = 1000
+; Timeout for convert process in ms. Default is 60000 (1min)
+convert_process_timeout = 1000
+; Timeout for changes feed in ms. Default is 10000
+changes_feed_timeout = 1000
 ; Batch size. Default is 100
 limit = 10
 ```
@@ -50,20 +52,10 @@ databases which have such a design document.
   "_id": "_design/my-couchmagick-config",
   "_rev": "1-a653b27246b01cf9204fa9f5dee7cc64",
   "couchmagick": {
-    "filter": "function(doc) { return doc.type === 'post'; }",
     "versions": {
       "thumbnail": {
-        "filter": "function(doc, name) { return doc.display && doc.display.indexOf('overview') > -1; }",
-        "id": "{id}/thumbnail",
-        "name": "{basename}-thumbnail.jpg",
-        "content_type": "image/jpeg",
         "args": [
-          "-",
-          "-resize", "x100",
-          "-quality", "75",
-          "-colorspace", "sRGB",
-          "-strip",
-          "jpg:-"
+          "-resize", "x100"
         ]
       }
     }
@@ -71,7 +63,7 @@ databases which have such a design document.
 }
 ```
 
-See [couchmagick-stream](https://github.com/null2/couchmagick-stream) for available options;
+See [couchmagick-stream](https://github.com/null2/couchmagick-stream) for available options.
 
 
 Contributing

index.js

@@ -6,7 +6,6 @@
 var pkg = require('./package.json');
 
 var url = require('url');
-var es = require('event-stream');
 var async = require('async');
 var nano = require('nano');
 var magick = require('couchmagick-listen');
@@ -16,8 +15,6 @@ var couchmagick = daemon(process.stdin, process.stdout, function() {
   process.exit(0);
 });
 
-var noop = function() {};
-
 couchmagick.get({
   // Connection
   address: 'httpd.bind_address',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "couchmagick",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "description": "Run ImageMagicks `convert` on CouchDB documents.",
   "main": "index.js",
   "preferGlobal": true,
@@ -28,8 +28,7 @@
   "homepage": "https://github.com/jo/couchmagick",
   "dependencies": {
     "async": "~0.2.9",
-    "event-stream": "~3.0.20",
-    "couchmagick-listen": "~1.5.2",
+    "couchmagick-listen": "~1.5.5",
     "couch-daemon": "~1.2.1",
     "nano": "~4.2.1"
   },