mirror of
				https://github.com/TeaOSLab/EdgeAdmin.git
				synced 2025-11-04 05:00:25 +08:00 
			
		
		
		
	在缓存任务键值中增加集群信息,以便于调试问题
This commit is contained in:
		@@ -99,11 +99,24 @@ func (this *TaskAction) readTask(taskId int64) (ok bool) {
 | 
				
			|||||||
			})
 | 
								})
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							// 集群信息
 | 
				
			||||||
 | 
							var clusterMap = maps.Map{
 | 
				
			||||||
 | 
								"id":   0,
 | 
				
			||||||
 | 
								"name": "",
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							if key.NodeCluster != nil {
 | 
				
			||||||
 | 
								clusterMap = maps.Map{
 | 
				
			||||||
 | 
									"id":   key.NodeCluster.Id,
 | 
				
			||||||
 | 
									"name": key.NodeCluster.Name,
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		keyMaps = append(keyMaps, maps.Map{
 | 
							keyMaps = append(keyMaps, maps.Map{
 | 
				
			||||||
			"key":     key.Key,
 | 
								"key":     key.Key,
 | 
				
			||||||
			"isDone":  key.IsDone,
 | 
								"isDone":  key.IsDone,
 | 
				
			||||||
			"isDoing": key.IsDoing,
 | 
								"isDoing": key.IsDoing,
 | 
				
			||||||
			"errors":  errorMaps,
 | 
								"errors":  errorMaps,
 | 
				
			||||||
 | 
								"cluster": clusterMap,
 | 
				
			||||||
		})
 | 
							})
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -71,19 +71,24 @@
 | 
				
			|||||||
                <span v-if="task.keyType == 'key'">URL</span>
 | 
					                <span v-if="task.keyType == 'key'">URL</span>
 | 
				
			||||||
                <span v-if="task.keyType == 'prefix'">前缀</span>
 | 
					                <span v-if="task.keyType == 'prefix'">前缀</span>
 | 
				
			||||||
            </th>
 | 
					            </th>
 | 
				
			||||||
 | 
					            <th class="two wide">所属集群</th>
 | 
				
			||||||
            <th class="width5">状态</th>
 | 
					            <th class="width5">状态</th>
 | 
				
			||||||
        </tr>
 | 
					        </tr>
 | 
				
			||||||
    </thead>
 | 
					    </thead>
 | 
				
			||||||
    <tbody v-for="key in task.keys">
 | 
					    <tbody v-for="key in task.keys">
 | 
				
			||||||
        <tr>
 | 
					        <tr>
 | 
				
			||||||
            <td>{{key.key}}
 | 
					            <td>
 | 
				
			||||||
 | 
					                {{key.key}}
 | 
				
			||||||
                <div v-if="key.errors.length > 0" style="margin-top: 0.5em">
 | 
					                <div v-if="key.errors.length > 0" style="margin-top: 0.5em">
 | 
				
			||||||
                    <a :href="'/clusters/cluster/node?nodeId=' + err.nodeId" v-for="err in key.errors" class="ui label basic tiny red">
 | 
					                    <a :href="'/clusters/cluster/node?nodeId=' + err.nodeId" v-for="err in key.errors" class="ui label basic tiny red">
 | 
				
			||||||
                        节点{{err.nodeId}}:{{err.error}}
 | 
					                        节点{{err.nodeId}}:{{err.error}}
 | 
				
			||||||
                    </a>
 | 
					                    </a>
 | 
				
			||||||
                </div>
 | 
					                </div>
 | 
				
			||||||
            </td>
 | 
					            </td>
 | 
				
			||||||
 | 
					            <td>
 | 
				
			||||||
 | 
					                <span v-if="key.cluster != null && key.cluster.id > 0">{{key.cluster.name}}</span>
 | 
				
			||||||
 | 
					                <span v-else class="disabled">-</span>
 | 
				
			||||||
 | 
					            </td>
 | 
				
			||||||
            <td>
 | 
					            <td>
 | 
				
			||||||
                <span v-if="key.isDone && key.errors.length == 0" class="green">完成</span>
 | 
					                <span v-if="key.isDone && key.errors.length == 0" class="green">完成</span>
 | 
				
			||||||
                <span v-if="key.isDone && key.errors.length > 0" class="red">失败</span>
 | 
					                <span v-if="key.isDone && key.errors.length > 0" class="red">失败</span>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user