github-personal/sysadm
1
0
Fork 0
mirror of https://github.com/outbackdingo/sysadm.git synced 2026-01-27 02:20:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:trueos/sysadm

Browse Source
This commit is contained in:
Mrt134
2016-09-13 13:03:53 -04:00
parent 1149f0b365 44b6b88699
commit 010fc464a2
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/library/sysadm-firewall.cpp
View File

@@ -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()
@@ -256,10 +255,9 @@ void Firewall::SaveOpenPorts(QList<PortInfo> 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);
}
}*/
}

4
src/server/library/sysadm-systemmanager.cpp
View File

@@ -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<output.length(); i++){
if (output.at(i).contains("PID") && output.at(i).contains("USERNAME")){
@@ -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);