From 303adbf9b13975636f48d9d33b1962e2685a28c9 Mon Sep 17 00:00:00 2001 From: Ponkhy Date: Sat, 28 Aug 2021 21:20:25 +0200 Subject: [PATCH] Show latest dns result in Details.vue --- db/patch7.sql | 3 +++ server/model/monitor.js | 12 ++++++++++++ src/pages/Details.vue | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/db/patch7.sql b/db/patch7.sql index 2e8eba15..4085daf3 100644 --- a/db/patch7.sql +++ b/db/patch7.sql @@ -7,4 +7,7 @@ ALTER TABLE monitor ALTER TABLE monitor ADD dns_resolve_server VARCHAR(255); +ALTER TABLE monitor + ADD dns_last_result VARCHAR(255); + COMMIT; diff --git a/server/model/monitor.js b/server/model/monitor.js index f5efadc1..a01dd614 100644 --- a/server/model/monitor.js +++ b/server/model/monitor.js @@ -50,6 +50,7 @@ class Monitor extends BeanModel { accepted_statuscodes: this.getAcceptedStatuscodes(), dns_resolve_type: this.dns_resolve_type, dns_resolve_server: this.dns_resolve_server, + dns_last_result: this.dns_last_result, notificationIDList, }; } @@ -207,6 +208,17 @@ class Monitor extends BeanModel { dnsMessage = dnsMessage.slice(0, -2) } + let dnsLastResult = await R.findOne("monitor", "id = ?", [ + this.id, + ]); + + if (dnsLastResult.dnsLastResult !== dnsMessage) { + R.exec("UPDATE `monitor` SET dns_last_result = ? WHERE id = ? ", [ + dnsMessage, + this.id + ]); + } + bean.msg = dnsMessage; bean.status = UP; } diff --git a/src/pages/Details.vue b/src/pages/Details.vue index f06f9e13..8da1112b 100644 --- a/src/pages/Details.vue +++ b/src/pages/Details.vue @@ -10,7 +10,7 @@
{{ $t("Keyword") }}: {{ monitor.keyword }} - [{{ monitor.dns_resolve_type }}] {{ monitor.hostname }} + [{{ monitor.dns_resolve_type }}] {{ monitor.hostname }} [ {{ monitor.dns_last_result }} ]