From 9df060fd3d5a840b60505cbebd4619a66c1a0cbf Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 13 Sep 2016 12:05:38 -0400 Subject: [PATCH 1/3] Cleanup a couple backend API calls: 1) In the system manager "process info" function, use the -a flag for top so we get the whole command instead of just the first binary. 2)Cleanup a bit more of the backend of the new firewall manager. --- src/server/library/sysadm-firewall.cpp | 7 +++---- src/server/library/sysadm-systemmanager.cpp | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/server/library/sysadm-firewall.cpp b/src/server/library/sysadm-firewall.cpp index f02c01c..73dfd30 100644 --- a/src/server/library/sysadm-firewall.cpp +++ b/src/server/library/sysadm-firewall.cpp @@ -256,10 +256,9 @@ void Firewall::SaveOpenPorts(QList openports) file.close(); } //Re-load/start rules (just in case - it is a smart script) - if(IsRunning()) - { - QStringList args; + if(IsRunning()){ Restart(); } + /* QStringList args; args << "/usr/local/share/pcbsd/scripts/reset-firewall"; General::RunCommand("sh",args); - } + }*/ } diff --git a/src/server/library/sysadm-systemmanager.cpp b/src/server/library/sysadm-systemmanager.cpp index 9e155e2..2c169ae 100644 --- a/src/server/library/sysadm-systemmanager.cpp +++ b/src/server/library/sysadm-systemmanager.cpp @@ -257,7 +257,7 @@ QJsonObject SysMgmt::memoryStats() { QJsonObject SysMgmt::procInfo() { QJsonObject retObject; QStringList output; - output = General::RunCommand("top -t -n all").split("\n"); + output = General::RunCommand("top -t -n -a all").split("\n"); bool inSection = false; for(int i=0; i Date: Tue, 13 Sep 2016 12:13:09 -0400 Subject: [PATCH 2/3] Oops - now the top parser will output the whole command. --- src/server/library/sysadm-systemmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/library/sysadm-systemmanager.cpp b/src/server/library/sysadm-systemmanager.cpp index 2c169ae..a19b518 100644 --- a/src/server/library/sysadm-systemmanager.cpp +++ b/src/server/library/sysadm-systemmanager.cpp @@ -283,7 +283,7 @@ QJsonObject SysMgmt::procInfo() { values.insert("cpu", line.section(" ", 8, 8)); values.insert("time", line.section(" ", 9, 9)); values.insert("wcpu", line.section(" ", 10, 10)); - values.insert("command", line.section(" ", 11, 11)); + values.insert("command", line.section(" ", 11, -1)); // Add the PID object retObject.insert(pid, values); From 44b6b88699717edd7fda24e61d5320d320f849b9 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 13 Sep 2016 12:41:16 -0400 Subject: [PATCH 3/3] Clean up the firewall manager check for if it is enabled. Now it returns almost instantly instead of waiting for a few seconds. --- src/server/library/sysadm-firewall.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/server/library/sysadm-firewall.cpp b/src/server/library/sysadm-firewall.cpp index 73dfd30..e2b2c38 100644 --- a/src/server/library/sysadm-firewall.cpp +++ b/src/server/library/sysadm-firewall.cpp @@ -148,8 +148,7 @@ bool Firewall::IsRunning() } bool Firewall::IsEnabled(){ - ServiceManager serviceManager; - return serviceManager.isEnabled( serviceManager.GetService("ipfw") ); + return (0 == system("sysrc -c firewall_enable=\"YES\"") ); } void Firewall::Start()