Merge pull request #59 from cp2boston/RCB-482_remove_429_loop

Removed 429 loop

Author: cp2boston

examples/syntax_dependencies.js

@@ -5,7 +5,7 @@ var ArgumentParser = require("argparse").ArgumentParser;
 
 var parser = new ArgumentParser({
   addHelp: true,
-  description: "Get the entities from a piece of text"
+  description: "Get the syntactic dependencies from a piece of text"
 });
 parser.addArgument(["--key"], {help: "Rosette API key", required: true});
 parser.addArgument(["--url"], {help: "Rosette API alt-url", required: false});

lib/parameters.js

@@ -102,8 +102,6 @@ parameters.prototype.loadParams = function() {
         "options": this.options,
         "explain": this.explain,
         "short-string": this.shortString,
-        "_maxRetries": this.maxRetries,
-        "_msInterval": this.msInterval,
         "_customHeaders": this.customHeaders
     };
 

lib/rosetteRequest.js

@@ -49,14 +49,6 @@ rosetteRequest.prototype.bindingVersion = function() { return BINDING_VERSION; }
  * @param {function} callback - Callback function to be exectuted after the function to which it is passed is complete
  */
 rosetteRequest.prototype.makeRequest = function(requestType, userKey, protocol, urlParts, parameters, callback) {
-    var maxRetries = 5;
-    var interval = 500;
-
-    if (parameters != null) {
-        maxRetries = parameters._maxRetries || maxRetries;
-        interval = parameters._microInterval || interval;
-    }
-
     var headers = {
         "accept": "application/json",
         "accept-encoding": "gzip",
@@ -89,9 +81,6 @@ rosetteRequest.prototype.makeRequest = function(requestType, userKey, protocol,
         options.port = urlParts.port;
     }
 
-    var retries = 5;
-    var retry = 0;
-
     var requestTask = function(callback) {
         var result = new Buffer("");
         // execute the http/https request
@@ -115,10 +104,7 @@ rosetteRequest.prototype.makeRequest = function(requestType, userKey, protocol,
 
                 if (res.statusCode === 200) {
                     return callback(null, JSON.parse(result.toString()));
-                } else if (res.statusCode === 429 && retry++ < maxRetries) {
-                    req.end();
-                    setTimeout(requestTask(callback), interval);
-                } else if (res.statusCode != 200) {
+                } else {
                     return callback(new RosetteException(res.statusCode, result.toString()));
                 }
             });