From 34c3abb297521f62363a74c25deeb64802503e93 Mon Sep 17 00:00:00 2001 From: Jacky Date: Tue, 4 Feb 2025 21:51:36 +0800 Subject: [PATCH 1/5] refactor: nodes analytics --- api/nginx_log/nginx_log.go | 4 +- .../dashboard/components/NodeAnalyticItem.vue | 7 +- app/src/views/environment/Environment.vue | 15 ++-- internal/analytic/node_record.go | 77 +++++++++---------- internal/analytic/node_stat.go | 3 - internal/pty/pipeline.go | 6 +- model/model.go | 2 +- 7 files changed, 55 insertions(+), 59 deletions(-) diff --git a/api/nginx_log/nginx_log.go b/api/nginx_log/nginx_log.go index e230b5130..078c4e956 100644 --- a/api/nginx_log/nginx_log.go +++ b/api/nginx_log/nginx_log.go @@ -2,6 +2,7 @@ package nginx_log import ( "encoding/json" + "github.com/0xJacky/Nginx-UI/internal/helper" "github.com/0xJacky/Nginx-UI/internal/nginx" "github.com/0xJacky/Nginx-UI/internal/nginx_log" "github.com/gin-gonic/gin" @@ -252,8 +253,7 @@ func tailNginxLog(ws *websocket.Conn, controlChan chan controlStruct, errChan ch } err = ws.WriteMessage(websocket.TextMessage, []byte(line.Text)) - - if err != nil && websocket.IsUnexpectedCloseError(err, websocket.CloseNormalClosure) { + if helper.IsUnexpectedWebsocketError(err) { errChan <- errors.Wrap(err, "error tailNginxLog write message") return } diff --git a/app/src/views/dashboard/components/NodeAnalyticItem.vue b/app/src/views/dashboard/components/NodeAnalyticItem.vue index fdc3967d6..40b9893b8 100644 --- a/app/src/views/dashboard/components/NodeAnalyticItem.vue +++ b/app/src/views/dashboard/components/NodeAnalyticItem.vue @@ -31,7 +31,7 @@ defineProps<{
- 1min:{{ ` ${item.avg_load?.load1?.toFixed(2)}` }} · + 1min:{{ item.avg_load?.load1?.toFixed(2) }} · 5min:{{ item.avg_load?.load5?.toFixed(2) }} · 15min:{{ item.avg_load?.load15?.toFixed(2) }}
@@ -123,6 +123,11 @@ defineProps<{ .longer { width: 180px; } + + .load-avg-describe { + margin-right: 2px; + } + @media (max-width: 400px) { .longer { width: 180px; diff --git a/app/src/views/environment/Environment.vue b/app/src/views/environment/Environment.vue index ad535c806..478aa34bd 100644 --- a/app/src/views/environment/Environment.vue +++ b/app/src/views/environment/Environment.vue @@ -8,10 +8,15 @@ import { message } from 'ant-design-vue' const route = useRoute() const curd = ref() +const loadingFromSettings = ref(false) + function loadFromSettings() { + loadingFromSettings.value = true environment.load_from_settings().then(() => { curd.value.get_list() message.success($gettext('Load successfully')) + }).finally(() => { + loadingFromSettings.value = false }) } const selectedNodeIds = ref([]) @@ -25,14 +30,6 @@ function batchUpgrade() { const inTrash = computed(() => { return route.query.trash === 'true' }) - -// const timer = setInterval(() => { -// curd.value.get_list() -// }, 10000) - -// onUnmounted(() => { -// clearInterval(timer) -// })