updated backend

stand4love@163.com · stand4love@163.com · commit 19e8af597641 · 2019-01-17T16:27:20.000+08:00
diff --git a/lib/common/errors.js b/lib/common/errors.js
@@ -15,19 +15,18 @@
  * the base error class
  */
 class AppError extends Error {
-  constructor(redis, status, message) {
+  constructor(instanceId, status, message) {
     super();
-    this.redis = redis || {};
-    delete this.redis.password;
 
+    this.instanceId = instanceId;
     this.status = status;
     this.message = message || 'unknown exception';
     this.lineNo = -1;
   }
 }
 
 module.exports = {
-  newConnectTimeoutError: (redis, msg) => new AppError(redis, 500, msg || 'ConnectTimeout'),
-  newConnectFailedError: (redis, msg) => new AppError(redis, 500, msg || 'ConnectFailed'),
-  newReplyError: (redis, msg, lineNo = -1) => new AppError(redis, 400, msg, lineNo),
+  newConnectTimeoutError: (instanceId, msg) => new AppError(instanceId, 500, msg || 'ConnectTimeout'),
+  newConnectFailedError: (instanceId, msg) => new AppError(instanceId, 500, msg || 'ConnectFailed'),
+  newReplyError: (instanceId, msg, lineNo = -1) => new AppError(instanceId, 400, msg, lineNo),
 };
diff --git a/lib/index.js b/lib/index.js
@@ -39,7 +39,7 @@ module.exports = {
               result = await handler.method(req, h);
             } catch (e) {
               logger.error(e);
-              result = {code: e.status, redis: e.redis, message: e.message, line: e.lineNo || -1}
+              result = {code: e.status, instanceId: e.instanceId, message: e.message, line: e.lineNo || -1}
               status = e.status || 500;
             }
             return injectHeader(h.response(result).code(status));
diff --git a/lib/redis.js b/lib/redis.js
@@ -30,21 +30,22 @@ async function connect(body) {
       host: body.serverModel.ip, port: body.serverModel.port, db: body.serverModel.db,
       password: body.serverModel.password,
       showFriendlyErrorStack: true,
-      maxRetriesPerRequest: 10,
     });
-    
-    body.serverModel.id = body.id;
 
     const timeoutHandler = setTimeout(() => {
       redis.disconnect();
-      reject(errors.newConnectTimeoutError(body.serverModel));
+      reject(errors.newConnectTimeoutError(body.id));
     }, 3 * 1000);
 
     redis.on('error', (e) => {
       console.error(e);
       body.status = DISCONNECTED;
     });
 
+    redis.on('end', () => {
+      redisInstanceCache[body.id] = null;
+    });
+
     redis.on('ready', () => {
       body.redis = redis;
       body.status = CONNECTED;
@@ -63,8 +64,8 @@ async function connect(body) {
  */
 function getRedisConnection(query) {
   const redisConn = redisInstanceCache[query.id];
-  if (!redisConn && redisConn.status !== CONNECTED) {
-    throw errors.newConnectFailedError(redisConn ? redisConn.serverModel : {});
+  if (!redisConn || redisConn.status !== CONNECTED) {
+    throw errors.newConnectFailedError(query.id);
   }
   return redisConn;
 }
@@ -100,7 +101,7 @@ async function fetchTree(query) {
       }
     }
   } catch (e) {
-    throw errors.newReplyError(redisConn.serverModel, e.message);
+    throw errors.newReplyError(query.id, e.message);
   }
 
   const tree = {};
@@ -183,7 +184,7 @@ async function call(query, body) {
     try {
       results.push(await redis.call(...lines[i]));
     } catch (e) {
-      throw errors.newReplyError(redisConn.serverModel, e.message, i + 1);
+      throw errors.newReplyError(query.id, e.message, i + 1);
     }
   }
   return results;
@@ -201,7 +202,7 @@ async function dump(query) {
   try {
     return await redisDump(query.exportType, redis);
   } catch (e) {
-    throw errors.newReplyError(redisConn.serverModel, e.message);
+    throw errors.newReplyError(query.id, e.message);
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ module.exports = {`
`39`	`39`	`result = await handler.method(req, h);`
`40`	`40`	`} catch (e) {`
`41`	`41`	`logger.error(e);`
`42`		`- result = {code: e.status, redis: e.redis, message: e.message, line: e.lineNo \|\| -1}`
	`42`	`+ result = {code: e.status, instanceId: e.instanceId, message: e.message, line: e.lineNo \|\| -1}`
`43`	`43`	`status = e.status \|\| 500;`
`44`	`44`	`}`
`45`	`45`	`return injectHeader(h.response(result).code(status));`