diff --git a/README.md b/README.md index bf800cb..35d6046 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Python Support](https://img.shields.io/badge/python-2.7%2B%20-blue.svg)](https://github.com/cppla/ServerStatus) [![C++ Compiler](http://img.shields.io/badge/C++-GNU-blue.svg?style=flat&logo=cplusplus)](https://github.com/cppla/ServerStatus) [![License](https://img.shields.io/badge/license-MIT-4EB1BA.svg?style=flat-square)](https://github.com/cppla/ServerStatus) -[![Version](https://img.shields.io/badge/Version-Beta%201.0.4-red)](https://github.com/cppla/ServerStatus) +[![Version](https://img.shields.io/badge/Version-Beta%201.0.5-red)](https://github.com/cppla/ServerStatus) ![Latest Version](http://dl.cpp.la/Archive/serverstatus-1.0.2.png) diff --git a/server/src/main.cpp b/server/src/main.cpp index 8897b4a..b3473e2 100644 --- a/server/src/main.cpp +++ b/server/src/main.cpp @@ -264,10 +264,10 @@ void CMain::JSONUpdateThread(void *pUser) else 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 + // track month network traffic, diff: 2021-10-01 00:05, 5minutes // last_network_in/out is last record flag. time_t currentStamp = (long long)time(/*ago*/0); - if(0 == pClients[i].m_LastNetworkIN || (localtime(¤tStamp)->tm_mday == pClients[i].m_aMonthStart && localtime(¤tStamp)->tm_hour == 0 && localtime(¤tStamp)->tm_min < 10)) + if(0 == pClients[i].m_LastNetworkIN || (localtime(¤tStamp)->tm_mday == pClients[i].m_aMonthStart && localtime(¤tStamp)->tm_hour == 0 && localtime(¤tStamp)->tm_min < 5)) { pClients[i].m_LastNetworkIN = pClients[i].m_Stats.m_NetworkIN; pClients[i].m_LastNetworkOUT = pClients[i].m_Stats.m_NetworkOUT; @@ -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 == 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_NetworkIN == 0 || pClients[i].m_LastNetworkIN == 0 || pClients[i].m_LastNetworkIN > pClients[i].m_Stats.m_NetworkIN? 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_LastNetworkOUT > pClients[i].m_Stats.m_NetworkOUT ? pClients[i].m_Stats.m_NetworkOUT : pClients[i].m_LastNetworkOUT, pClients[i].m_Stats.m_aCustom); pBuf += strlen(pBuf); } diff --git a/web/css/dark.css b/web/css/dark.css index 13b15e7..204542d 100644 --- a/web/css/dark.css +++ b/web/css/dark.css @@ -17,9 +17,10 @@ body { background: #222 url('../img/dark.png'); color: #fff; } tr.even.expandRow > :hover { background: #2F2F2F !important; } tr.odd.expandRow > :hover { background: #000 !important; } .expandRow > td { padding: 0 !important; border-top: 0px !important; } -#month_traffic { min-width: 85px; } -#network { min-width: 80px; } +#month_traffic { min-width: 85px; max-width: 95px;} +#network { min-width: 85px; } #cpu, #ram, #hdd { min-width: 45px; max-width: 90px; } +#ping { max-width: 85px; } @media only screen and (max-width: 992px) { #type, tr td:nth-child(4) { display:none; visibility:hidden; } @@ -35,6 +36,7 @@ tr.odd.expandRow > :hover { background: #000 !important; } @media only screen and (max-width: 620px) { body { font-size: 10px; } .content { padding: 0; } + #month_traffic, tr td:nth-child(2) { display:none; visibility:hidden; } #type, tr td:nth-child(4) { display:none; visibility:hidden; } #location, tr td:nth-child(5) { display:none; visibility:hidden; } #uptime, tr td:nth-child(6) { display:none; visibility:hidden; } @@ -44,6 +46,7 @@ tr.odd.expandRow > :hover { background: #000 !important; } @media only screen and (max-width: 533px) { body { font-size: 10px; } .content { padding: 0; } + #month_traffic, tr td:nth-child(2) { display:none; visibility:hidden; } #type, tr td:nth-child(4) { display:none; visibility:hidden; } #location, tr td:nth-child(5) { display:none; visibility:hidden; } #uptime, tr td:nth-child(6) { display:none; visibility:hidden; } @@ -53,11 +56,12 @@ tr.odd.expandRow > :hover { background: #000 !important; } @media only screen and (max-width: 450px) { body { font-size: 10px; } .content { padding: 0; } + #month_traffic, tr td:nth-child(2) { display:none; visibility:hidden; } #name, tr td:nth-child(3) { min-width: 55px; max-width: 85px; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; } #type, tr td:nth-child(4) { display:none; visibility:hidden; } #location, tr td:nth-child(5) { display:none; visibility:hidden; } #uptime, tr td:nth-child(6) { display:none; visibility:hidden; } #traffic, tr td:nth-child(9) { display:none; visibility:hidden; } - #cpu, #ram, #hdd { min-width: 25px; max-width: 50px; } + #cpu, #ram, #hdd { min-width: 25px; max-width: 50px; } #ping, tr td:nth-child(13) { display:none; visibility:hidden; } } \ No newline at end of file diff --git a/web/css/light.css b/web/css/light.css index c832bcc..31d463b 100644 --- a/web/css/light.css +++ b/web/css/light.css @@ -14,9 +14,10 @@ body { background: #ebebeb url('../img/light.png'); } tr.even.expandRow > :hover { background: #F9F9F9 !important; } tr.odd.expandRow > :hover { background: #FFF !important; } .expandRow > td { padding: 0 !important; border-top: 0px !important; } -#month_traffic { min-width: 85px; } -#network { min-width: 80px; } -#cpu, #ram, #hdd, #network { min-width: 45px; max-width: 90px; } +#month_traffic { min-width: 85px; max-width: 95px;} +#network { min-width: 85px; } +#cpu, #ram, #hdd { min-width: 45px; max-width: 90px; } +#ping { max-width: 85px; } @media only screen and (max-width: 992px) { #type, tr td:nth-child(4) { display:none; visibility:hidden; } @@ -32,6 +33,7 @@ tr.odd.expandRow > :hover { background: #FFF !important; } @media only screen and (max-width: 620px) { body { font-size: 10px; } .content { padding: 0; } + #month_traffic, tr td:nth-child(2) { display:none; visibility:hidden; } #type, tr td:nth-child(4) { display:none; visibility:hidden; } #location, tr td:nth-child(5) { display:none; visibility:hidden; } #uptime, tr td:nth-child(6) { display:none; visibility:hidden; } @@ -41,6 +43,7 @@ tr.odd.expandRow > :hover { background: #FFF !important; } @media only screen and (max-width: 533px) { body { font-size: 10px; } .content { padding: 0; } + #month_traffic, tr td:nth-child(2) { display:none; visibility:hidden; } #type, tr td:nth-child(4) { display:none; visibility:hidden; } #location, tr td:nth-child(5) { display:none; visibility:hidden; } #uptime, tr td:nth-child(6) { display:none; visibility:hidden; } @@ -50,11 +53,12 @@ tr.odd.expandRow > :hover { background: #FFF !important; } @media only screen and (max-width: 450px) { body { font-size: 10px; } .content { padding: 0; } + #month_traffic, tr td:nth-child(2) { display:none; visibility:hidden; } #name, tr td:nth-child(3) { min-width: 55px; max-width: 85px; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; } #type, tr td:nth-child(4) { display:none; visibility:hidden; } #location, tr td:nth-child(5) { display:none; visibility:hidden; } #uptime, tr td:nth-child(6) { display:none; visibility:hidden; } #traffic, tr td:nth-child(9) { display:none; visibility:hidden; } - #cpu, #ram, #hdd { min-width: 25px; max-width: 50px; } + #cpu, #ram, #hdd { min-width: 25px; max-width: 50px; } #ping, tr td:nth-child(13) { display:none; visibility:hidden; } } \ No newline at end of file diff --git a/web/js/serverstatus.js b/web/js/serverstatus.js index ba9266b..98dacbc 100644 --- a/web/js/serverstatus.js +++ b/web/js/serverstatus.js @@ -163,7 +163,7 @@ function uptime() { monthtraffic += (trafficdiff_out/1024/1024/1024).toFixed(2) + "G"; else 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].className = "progress-bar progress-bar-info"; TableRow.children["month_traffic"].children[0].children[0].innerHTML = ""+monthtraffic+""; // Uptime