Merge pull request #445 from crawlab-team/develop

added pointer to node list
This commit is contained in:
Marvin Zhang
2020-01-11 16:42:37 +08:00
committed by GitHub
2 changed files with 14 additions and 3 deletions

View File

@@ -9,6 +9,7 @@ import (
"encoding/json"
"fmt"
"github.com/apex/log"
"github.com/gomodule/redigo/redis"
uuid "github.com/satori/go.uuid"
"runtime/debug"
)
@@ -185,10 +186,12 @@ func InitRpcService() error {
}
// 获取获取消息队列信息
dataStr, err := database.RedisClient.BRPop(fmt.Sprintf("rpc:%s", node.Id.Hex()), constants.Infinite)
dataStr, err := database.RedisClient.BRPop(fmt.Sprintf("rpc:%s", node.Id.Hex()), 0)
if err != nil {
log.Errorf(err.Error())
debug.PrintStack()
if err != redis.ErrNil {
log.Errorf(err.Error())
debug.PrintStack()
}
continue
}

View File

@@ -26,6 +26,7 @@
class="table"
:header-cell-style="{background:'rgb(48, 65, 86)',color:'white'}"
border
@row-click="onRowClick"
@expand-change="onRowExpand">
<el-table-column type="expand">
<template slot-scope="scope">
@@ -260,6 +261,9 @@ export default {
onRowExpand (row) {
this.$store.dispatch('node/getNodeSystemInfo', row._id)
},
onRowClick (row) {
this.onView(row)
},
getExecutables (row) {
if (!row.systemInfo || !row.systemInfo.executables) return []
return row.systemInfo.executables
@@ -354,4 +358,8 @@ export default {
.node-detail .executable-list .executable-label {
margin-left: 5px;
}
.table.el-table tr {
cursor: pointer;
}
</style>