Merge pull request #3 from georgeye/master

Update att_convert (transmog service) retry time to 60 seconds.
georgeye · Nov 21, 2012 · a065b1a · a065b1a
2 parents 0be6f5d + 53e10ec
commit a065b1a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/client/queue_client.js b/client/queue_client.js
@@ -91,7 +91,7 @@ Queue_Client.prototype.next = function(callback) {
             }
             var tokens = key.split(":");
             if(tokens.length == 4) {
-                self.redis_client.get(tokens[3] + ":status", function(err, res)
+                self.redis_work.get(tokens[3] + ":status", function(err, res)
                 {
                   if(!err && res == "done") {
                     self.complete(tokens[3]);

diff --git a/config.js b/config.js
@@ -5,5 +5,5 @@ config.logLevel = 4;
 config.redis_server_port = 6379;
 config.redis_server_name = '127.0.0.1';
 config.default_retry_interval = 10; // in 10 seconds
-config.push_retry_interval = 30; // in 10 seconds
+config.att_convert_retry_interval = 60; // in 60 seconds for transmog
 module.exports = config;
diff --git a/index.js b/index.js
@@ -102,28 +102,28 @@ function schedule_for_retry(work_client, message) {
         utils.logDebug("This event was completed, no more retry");
       }
       else if(!err) {
-        work_client.get(key + ":num_retry", function(err, value) {
+        work_client.get(key + ":num_retry", function(err, value1) {
           if(err) {
               utils.logError("Failed to get num_retry for:" + key + ", err=" + err);
           }
-          else if(value && parseInt(value) > MAX_RETRY) {
+          else if(value1 && parseInt(value1) > MAX_RETRY) {
               utils.logError("Exceeded max retry count, ignore event:" + key);
               work_client.del(key);
               work_client.del(key + ":num_retry");
               work_client.del("payload:" + id);
           }
           else {
-              utils.logInfo("schedule " + key + " for retry\n");
+              utils.logInfo("schedule " + key + " for retry, value=" + value1);
               //schedle for retry
               work_client.set(key, "retry");
-              new_retry = value ? parseInt(value) + 1 : 1;
+              new_retry = value1 ? parseInt(value1) + 1 : 1;
               work_client.set(key + ":num_retry", new_retry);
-              get_retry_interval(key.split(":")[1], function(err, value) {
+              get_retry_interval(key.split(":")[1], function(err, value2) {
                 if(err) {
                   work_client.expire(key, config.default_retry_interval*Math.pow(2, new_retry - 1));
                 }
                 else {
-                  if(value) {work_client.expire(key, value*Math.pow(2, new_retry-1));}
+                  if(value2) {work_client.expire(key, value2*Math.pow(2, new_retry-1));}
                   else {work_client.expire(key, config.default_retry_interval*Math.pow(2, new_retry - 1));}
                 }
               });