From a5330dcf2fde4d17da0dd78c10613e2e73133eab Mon Sep 17 00:00:00 2001
From: windows11 <windows11@pc>
Date: Fri, 13 Oct 2023 11:58:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dusername=E7=AD=89=E9=9D=99?=
=?UTF-8?q?=E6=80=81=E5=8F=98=E9=87=8F=E7=9A=84=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
=?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
server/src/main.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/server/src/main.cpp b/server/src/main.cpp
index 61ab9fa..f769a2c 100644
--- a/server/src/main.cpp
+++ b/server/src/main.cpp
@@ -271,7 +271,13 @@ void CMain::WatchdogMessage(int ClientNetID, double load_1, double load_5, doubl
typedef exprtk::parser<double> parser_t;
const std::string expression_string = Watchdog(ID)->m_aRule;
+ int ClientID = ClientNetToClient(ClientNetID);
symbol_table_t symbol_table;
+ symbol_table.add_variable("username", Client(ClientID)->m_aUsername);
+ symbol_table.add_variable("name", Client(ClientID)->m_aName);
+ symbol_table.add_variable("type", Client(ClientID)->m_aType);
+ symbol_table.add_variable("host", Client(ClientID)->m_aHost);
+ symbol_table.add_variable("location", Client(ClientID)->m_aLocation);
symbol_table.add_variable("load_1",load_1);
symbol_table.add_variable("load_5",load_5);
symbol_table.add_variable("load_15",load_15);
@@ -310,7 +316,6 @@ void CMain::WatchdogMessage(int ClientNetID, double load_1, double load_5, doubl
if (expression.value() > 0)
{
- int ClientID = ClientNetToClient(ClientNetID);
time_t currentStamp = (long long)time(/*ago*/0);
if ((currentStamp-Client(ClientID)->m_AlarmLastTime) > Watchdog(ID)->m_aInterval)
{