diff --git a/src/server/WebBackend.cpp b/src/server/WebBackend.cpp index cb8c529..b45ed29 100644 --- a/src/server/WebBackend.cpp +++ b/src/server/WebBackend.cpp @@ -319,6 +319,10 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSysadmSystemInfoRequest(const QJso ok = true; out->insert("memorystats", sysadm::SysInfo::memoryStats()); } + if(act=="procinfo"){ + ok = true; + out->insert("procinfo", sysadm::SysInfo::procInfo()); + } if(act=="systeminfo"){ ok = true; out->insert("systeminfo", sysadm::SysInfo::systemInfo()); diff --git a/src/server/library/sysadm-systeminfo.cpp b/src/server/library/sysadm-systeminfo.cpp index 235da49..9015ec9 100644 --- a/src/server/library/sysadm-systeminfo.cpp +++ b/src/server/library/sysadm-systeminfo.cpp @@ -210,6 +210,44 @@ QJsonObject SysInfo::memoryStats() { return retObject; } +// Return a json list of process information +QJsonObject SysInfo::procInfo() { + QJsonObject retObject; + QStringList output; + output = General::RunCommand("top -t -n all").split("\n"); + bool inSection = false; + for(int i=0; i