Changeset 528 for Dev

Timestamp:

03/23/14 17:56:32 (11 years ago)

Author:

hendrikvanantwerpen

Message:

Should not need retries with new request module.

File:

• Dev/trunk/src/server/util/couch.js (modified) (2 diffs)

Dev/trunk/src/server/util/couch.js

@@ -43 +43 @@
 }
 
-function couchRequest (method, url, body, opts, retries) {
+function couchRequest (method, url, body, opts) {
     body = body || {};
-    retries = _.isNumber(retries) ? retries : 3;
     var options = {
         method: method,
         headers: {},
         body: stringifyFunctions(body),
-        json: true,
-        timeout: 5000
+        json: true
     };
     if (opts) {
@@ -57 +55 @@
         if (opts.headers) { _.extend(options.headers, opts.headers); }
     }
-    return request(url, options)
-    .handle(function(status,body){
-        if ( _.isUndefined(body) ) {
-            if ( retries > 0) {
-                return couchRequest(method,url,body,opts,retries-1);
-            } else {
-                return new HTTPResult(-1,new Error("No response after several retries."));
-            }
-        } else {
-            return body;
-        }
-    });
+    return request(url, options);
 }