日志级别增加success

This commit is contained in:
GoEdgeLab
2021-06-06 13:40:47 +08:00
parent a708fc3150
commit 143e177f00
11 changed files with 16 additions and 4 deletions

View File

@@ -5,6 +5,7 @@ import (
"github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/configutils" "github.com/TeaOSLab/EdgeCommon/pkg/configutils"
"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
"github.com/iwind/TeaGo/maps" "github.com/iwind/TeaGo/maps"
@@ -255,10 +256,10 @@ func (this *IndexAction) RunGet(params struct {
// 显示服务相关的日志 // 显示服务相关的日志
errorLogsResp, err := this.RPC().NodeLogRPC().ListNodeLogs(this.AdminContext(), &pb.ListNodeLogsRequest{ errorLogsResp, err := this.RPC().NodeLogRPC().ListNodeLogs(this.AdminContext(), &pb.ListNodeLogsRequest{
NodeId: 0, NodeId: 0,
Role: "node", Role: nodeconfigs.NodeRoleNode,
Offset: 0, Offset: 0,
Size: 10, Size: 10,
Level: "error", Level: "",
FixedState: int32(configutils.BoolStateNo), FixedState: int32(configutils.BoolStateNo),
AllServers: true, AllServers: true,
}) })
@@ -290,6 +291,7 @@ func (this *IndexAction) RunGet(params struct {
"description": errorLog.Description, "description": errorLog.Description,
"createdTime": timeutil.FormatTime("Y-m-d H:i:s", errorLog.CreatedAt), "createdTime": timeutil.FormatTime("Y-m-d H:i:s", errorLog.CreatedAt),
"serverId": errorLog.ServerId, "serverId": errorLog.ServerId,
"level": errorLog.Level,
"serverName": server.Name, "serverName": server.Name,
}) })
} }

View File

@@ -7,6 +7,6 @@ Vue.component("node-log-row", {
} }
}, },
template: `<div> template: `<div>
<pre class="log-box" style="margin: 0; padding: 0"><span :class="{red:log.level == 'error', orange:log.level == 'warning'}"><span v-if="!log.isToday">[{{log.createdTime}}]</span><strong v-if="log.isToday">[{{log.createdTime}}]</strong><keyword :v-word="keyword">[{{log.tag}}]{{log.description}}</keyword></span> &nbsp; <span v-if="log.count > 0" class="ui label tiny" :class="{red:log.level == 'error', orange:log.level == 'warning'}">共{{log.count}}条</span></pre> <pre class="log-box" style="margin: 0; padding: 0"><span :class="{red:log.level == 'error', orange:log.level == 'warning', green: log.level == 'success'}"><span v-if="!log.isToday">[{{log.createdTime}}]</span><strong v-if="log.isToday">[{{log.createdTime}}]</strong><keyword :v-word="keyword">[{{log.tag}}]{{log.description}}</keyword></span> &nbsp; <span v-if="log.count > 0" class="ui label tiny" :class="{red:log.level == 'error', orange:log.level == 'warning'}">共{{log.count}}条</span></pre>
</div>` </div>`
}) })

View File

@@ -18,6 +18,7 @@
<option value="error">错误</option> <option value="error">错误</option>
<option value="warning">警告</option> <option value="warning">警告</option>
<option value="info">信息</option> <option value="info">信息</option>
<option value="success">成功</option>
</select> </select>
</div> </div>
<div class="ui field"> <div class="ui field">

View File

@@ -18,6 +18,7 @@
<option value="error">错误</option> <option value="error">错误</option>
<option value="warning">警告</option> <option value="warning">警告</option>
<option value="info">信息</option> <option value="info">信息</option>
<option value="success">成功</option>
</select> </select>
</div> </div>
<div class="ui field"> <div class="ui field">

View File

@@ -17,6 +17,7 @@
<option value="error">错误</option> <option value="error">错误</option>
<option value="warning">警告</option> <option value="warning">警告</option>
<option value="info">信息</option> <option value="info">信息</option>
<option value="success">成功</option>
</select> </select>
</div> </div>
<div class="ui field"> <div class="ui field">

View File

@@ -18,6 +18,7 @@
<option value="error">错误</option> <option value="error">错误</option>
<option value="warning">警告</option> <option value="warning">警告</option>
<option value="info">信息</option> <option value="info">信息</option>
<option value="success">成功</option>
</select> </select>
</div> </div>
<div class="ui field"> <div class="ui field">

View File

@@ -18,6 +18,7 @@
<option value="error">错误</option> <option value="error">错误</option>
<option value="warning">警告</option> <option value="warning">警告</option>
<option value="info">信息</option> <option value="info">信息</option>
<option value="success">成功</option>
</select> </select>
</div> </div>
<div class="ui field"> <div class="ui field">

View File

@@ -8,9 +8,11 @@
<span class="ui item active"><span class="red">需要修复的错误</span></span> <span class="ui item active"><span class="red">需要修复的错误</span></span>
</div> </div>
<div class="ui segment attached"> <div class="ui segment attached">
<div class="ui message error" v-for="log in errorLogs"> <div class="ui message" v-for="log in errorLogs" :class="{error: log.level == 'error', success: log.level == 'success'}">
[{{log.createdTime}}] [{{log.createdTime}}]
<a :href="'/servers/server/settings?serverId=' + log.serverId"><span v-if="log.serverName.length > 0">[{{log.serverName}}]</span><span v-else>[服务]</span></a> <a :href="'/servers/server/settings?serverId=' + log.serverId"><span v-if="log.serverName.length > 0">[{{log.serverName}}]</span><span v-else>[服务]</span></a>
<span v-if="log.level == 'error'">[错误]</span>
<span v-if="log.level == 'success'">[成功]</span>
{{log.description}} {{log.description}}
<a href="" title="关闭" @click.prevent="fixLog(log.id)"><i class="ui icon remove small"></i></a> <a href="" title="关闭" @click.prevent="fixLog(log.id)"><i class="ui icon remove small"></i></a>
</div> </div>

View File

@@ -18,6 +18,7 @@
<option value="error">错误</option> <option value="error">错误</option>
<option value="warning">警告</option> <option value="warning">警告</option>
<option value="info">信息</option> <option value="info">信息</option>
<option value="success">成功</option>
</select> </select>
</div> </div>
<div class="ui field"> <div class="ui field">

View File

@@ -18,6 +18,7 @@
<option value="error">错误</option> <option value="error">错误</option>
<option value="warning">警告</option> <option value="warning">警告</option>
<option value="info">信息</option> <option value="info">信息</option>
<option value="success">成功</option>
</select> </select>
</div> </div>
<div class="ui field"> <div class="ui field">

View File

@@ -18,6 +18,7 @@
<option value="error">错误</option> <option value="error">错误</option>
<option value="warning">警告</option> <option value="warning">警告</option>
<option value="info">信息</option> <option value="info">信息</option>
<option value="success">成功</option>
</select> </select>
</div> </div>
<div class="ui field"> <div class="ui field">