spark-store-project/ServerStatus
14
0
Fork 0
mirror of https://github.com//cppla/ServerStatus synced 2025-06-03 06:09:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复username等静态变量的表达式支持

Browse Source
This commit is contained in:
windows11 2023-10-13 11:58:46 +08:00
parent be78a7cc88
commit a5330dcf2f
1 changed files with 6 additions and 1 deletions

7
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)
{