back-end cleanup

stand4love@163.com · stand4love@163.com · commit 8757f5ad7668 · 2019-01-17T16:46:54.000+08:00
diff --git a/lib/redis.js b/lib/redis.js
@@ -18,9 +18,9 @@ const DISCONNECTED = 'disconnected';
 async function connect(body) {
   // already exist
   if (redisInstanceCache[body.id]) {
-    const redisConn = redisInstanceCache[body.id];
-    if (redisConn.status == DISCONNECTED) {
-      redisConn.redis.connect();
+    const redis = redisInstanceCache[body.id];
+    if (redis.redisStatus == DISCONNECTED) {
+      redis.redis.connect();
     }
     return Promise.resolve(body);
   }
@@ -39,17 +39,16 @@ async function connect(body) {
 
     redis.on('error', (e) => {
       console.error(e);
-      body.status = DISCONNECTED;
+      redis.redisStatus = DISCONNECTED;
     });
 
     redis.on('end', () => {
       redisInstanceCache[body.id] = null;
     });
 
     redis.on('ready', () => {
-      body.redis = redis;
-      body.status = CONNECTED;
-      redisInstanceCache[body.id] = body;
+      redis.redisStatus = CONNECTED;
+      redisInstanceCache[body.id] = redis;
       
       resolve(body);
       clearTimeout(timeoutHandler);
@@ -63,20 +62,19 @@ async function connect(body) {
  * @param query the query params
  */
 function getRedisConnection(query) {
-  const redisConn = redisInstanceCache[query.id];
-  if (!redisConn || redisConn.status !== CONNECTED) {
+  const redis = redisInstanceCache[query.id];
+  if (!redis || redis.redisStatus !== CONNECTED) {
     throw errors.newConnectFailedError(query.id);
   }
-  return redisConn;
+  return redis;
 }
 
 /**
  * fetch the redis tree
  * @param query the query params
  */
 async function fetchTree(query) {
-  const redisConn = getRedisConnection(query);
-  const redis = redisConn.redis;
+  const redis = getRedisConnection(query);
 
   const root = {};
   const lencommands = {
@@ -176,8 +174,7 @@ async function call(query, body) {
   if (!lines || lines.length <= 0) {
     return [];
   }
-  const redisConn = getRedisConnection(query);
-  const redis = redisConn.redis;
+  const redis = getRedisConnection(query);
 
   const results = [];
   for (let i = 0; i < lines.length; i++) {
@@ -196,8 +193,7 @@ async function call(query, body) {
  * @return {Promise<*>}
  */
 async function dump(query) {
-  const redisConn = getRedisConnection(query);
-  const redis = redisConn.redis;
+  const redis = getRedisConnection(query);
 
   try {
     return await redisDump(query.exportType, redis);
