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

testing

Browse Source
This commit is contained in:
windows11 2021-10-14 19:33:17 +08:00
parent b8a717a374
commit 45a0723bea
2 changed files with 11 additions and 9 deletions
server/src
main.cpp
web/js
serverstatus.js

6
server/src/main.cpp

@ -265,7 +265,7 @@ void CMain::JSONUpdateThread(void *pUser)
str_format(aUptime, sizeof(aUptime), "%02d:%02d:%02d", (int)(pClients[i].m_Stats.m_Uptime/60.0/60.0), (int)((pClients[i].m_Stats.m_Uptime/60)%60), (int)((pClients[i].m_Stats.m_Uptime)%60));
// track month network traffic, diff: 2021-10-01 00:10
// if ServerStatus is active then last_network_in/out is month traffic diff, else last_network_in/out is last record flag.
// last_network_in/out is last record flag.
time_t currentStamp = (long long)time(/*ago*/0);
if(0 == pClients[i].m_LastNetworkIN || (localtime(&currentStamp)->tm_mday == pClients[i].m_aMonthStart && localtime(&currentStamp)->tm_hour == 0 && localtime(&currentStamp)->tm_min < 10))
{
@ -281,8 +281,8 @@ void CMain::JSONUpdateThread(void *pUser)
pClients[i].m_Stats.m_time_10010, pClients[i].m_Stats.m_time_189, pClients[i].m_Stats.m_time_10086,pClients[i].m_Stats.m_tcpCount,pClients[i].m_Stats.m_udpCount,pClients[i].m_Stats.m_processCount,pClients[i].m_Stats.m_threadCount,
pClients[i].m_Stats.m_NetworkRx, pClients[i].m_Stats.m_NetworkTx, pClients[i].m_Stats.m_NetworkIN, pClients[i].m_Stats.m_NetworkOUT, (int)pClients[i].m_Stats.m_CPU, pClients[i].m_Stats.m_MemTotal, pClients[i].m_Stats.m_MemUsed,
pClients[i].m_Stats.m_SwapTotal, pClients[i].m_Stats.m_SwapUsed, pClients[i].m_Stats.m_HDDTotal, pClients[i].m_Stats.m_HDDUsed,
pClients[i].m_Stats.m_NetworkIN == 0 ? pClients[i].m_LastNetworkIN : pClients[i].m_Stats.m_NetworkIN - pClients[i].m_LastNetworkIN,
pClients[i].m_Stats.m_NetworkOUT == 0 ? pClients[i].m_LastNetworkOUT : pClients[i].m_Stats.m_NetworkOUT - pClients[i].m_LastNetworkOUT,
pClients[i].m_Stats.m_NetworkIN == 0 || pClients[i].m_LastNetworkIN == 0 ? pClients[i].m_Stats.m_NetworkIN : pClients[i].m_LastNetworkIN,
pClients[i].m_Stats.m_NetworkOUT == 0 || pClients[i].m_LastNetworkOUT == 0 ? pClients[i].m_Stats.m_NetworkOUT : pClients[i].m_LastNetworkOUT,
pClients[i].m_Stats.m_aCustom);
pBuf += strlen(pBuf);
}

14
web/js/serverstatus.js

@ -152,15 +152,17 @@ function uptime() {
// month traffic
var monthtraffic = "";
if(result.servers[i].last_network_in < 1024*1024*1024*1024)
monthtraffic += (result.servers[i].last_network_in/1024/1024/1024).toFixed(2) + "G";
var trafficdiff_in = result.servers[i].network_in - result.servers[i].last_network_in;
var trafficdiff_out = result.servers[i].network_out - result.servers[i].last_network_out;
if(trafficdiff_in < 1024*1024*1024*1024)
monthtraffic += (trafficdiff_in/1024/1024/1024).toFixed(2) + "G";
else
monthtraffic += (result.servers[i].last_network_in/1024/1024/1024/1024).toFixed(2) + "T";
monthtraffic += (trafficdiff_in/1024/1024/1024/1024).toFixed(2) + "T";
monthtraffic += " | "
if(result.servers[i].last_network_out < 1024*1024*1024*1024)
monthtraffic += (result.servers[i].last_network_out/1024/1024/1024).toFixed(2) + "G";
if(trafficdiff_out < 1024*1024*1024*1024)
monthtraffic += (trafficdiff_out/1024/1024/1024).toFixed(2) + "G";
else
monthtraffic += (result.servers[i].last_network_out/1024/1024/1024/1024).toFixed(2) + "T";
monthtraffic += (trafficdiff_out/1024/1024/1024/1024).toFixed(2) + "T";
TableRow.children["month_traffic"].children[0].children[0].className = "progress-bar";
TableRow.children["month_traffic"].children[0].children[0].innerHTML = "<small>"+monthtraffic+"</small>";