From b422be8c3d3151d764ed99adb4fa463aea156ae4 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Sun, 8 Mar 2020 15:30:12 +0800
Subject: [PATCH] try to fix installation error

---
 backend/services/rpc.go                        |  8 +++++++-
 .../components/Node/NodeInstallationMatrix.vue | 18 +++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/backend/services/rpc.go b/backend/services/rpc.go
index 6d733e66..57a208f8 100644
--- a/backend/services/rpc.go
+++ b/backend/services/rpc.go
@@ -192,21 +192,27 @@ func RpcClientFunc(nodeId string, method string, params map[string]string, timeo
 		// 发送RPC消息
 		msgStr := ObjectToString(msg)
 		if err := database.RedisClient.LPush(fmt.Sprintf("rpc:%s", nodeId), msgStr); err != nil {
+			log.Errorf("RpcClientFunc error: " + err.Error())
+			debug.PrintStack()
 			return result, err
 		}
 
 		// 获取RPC回复消息
 		dataStr, err := database.RedisClient.BRPop(fmt.Sprintf("rpc:%s", nodeId), timeout)
 		if err != nil {
+			log.Errorf("RpcClientFunc error: " + err.Error())
+			debug.PrintStack()
 			return result, err
 		}
 
 		// 反序列化消息
 		if err := json.Unmarshal([]byte(dataStr), &msg); err != nil {
+			log.Errorf("RpcClientFunc error: " + err.Error())
+			debug.PrintStack()
 			return result, err
 		}
 
-		return msg.Result, err
+		return msg.Result, nil
 	}
 }
 
diff --git a/frontend/src/components/Node/NodeInstallationMatrix.vue b/frontend/src/components/Node/NodeInstallationMatrix.vue
index d1c0f195..a144c53d 100644
--- a/frontend/src/components/Node/NodeInstallationMatrix.vue
+++ b/frontend/src/components/Node/NodeInstallationMatrix.vue
@@ -40,7 +40,7 @@
           <template slot="header" slot-scope="scope">
             <div class="header-with-action">
               <span>{{scope.column.label}}</span>
-              <el-button type="primary" size="mini" @click="onInstallAll(scope.column.name)">
+              <el-button type="primary" size="mini" @click="onInstallAll(scope.column.label)">
                 {{$t('Install')}}
               </el-button>
             </div>
@@ -113,13 +113,21 @@ export default {
   },
   methods: {
     async getData () {
-      await Promise.all(this.nodeList.map(async n => {
+      // await Promise.all(this.nodeList.map(async n => {
+      //   const res = await this.$request.get(`/nodes/${n._id}/langs`)
+      //   res.data.data.forEach(l => {
+      //     const key = n._id + '|' + l.executable_name
+      //     this.$set(this.dataDict, key, l)
+      //   })
+      // }))
+      for (let i = 0; i < this.nodeList.length; i++) {
+        const n = this.nodeList[i]
         const res = await this.$request.get(`/nodes/${n._id}/langs`)
         res.data.data.forEach(l => {
           const key = n._id + '|' + l.executable_name
           this.$set(this.dataDict, key, l)
         })
-      }))
+      }
     },
     getLang (nodeId, langName) {
       const key = nodeId + '|' + langName
@@ -149,11 +157,11 @@ export default {
         this.getData()
       }, 1000)
     },
-    async onInstallAll (langName) {
+    async onInstallAll (langLabel) {
       this.nodeList
         .filter(n => n.status === 'online')
         .forEach(n => {
-          this.onInstall(n._id, langName)
+          this.onInstall(n._id, langLabel)
         })
       setTimeout(() => {
         this.getData()