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

Move the "zpool list" parsing function over to a new library class (sysadm::ZFS). This adjusts the sysadm/zfs "list_pools" action return message a bit - it just moves the list of pools one level down - within a "list_pools" object.

Browse Source
This commit is contained in:
Ken Moore
2016-03-22 09:39:39 -04:00
parent 055f6e3be8
commit b074a611ee
5 changed files with 94 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/server/WebBackend.cpp
View File

@@ -17,9 +17,9 @@
#include "library/sysadm-network.h"
#include "library/sysadm-systemmanager.h"
#include "library/sysadm-update.h"
#include "library/sysadm-zfs.h"
#include "syscache-client.h"
//#include "dispatcher-client.h"
#define DEBUG 0
#define SCLISTDELIM QString("::::") //SysCache List Delimiter
@@ -672,27 +672,8 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSysadmZfsRequest(const QJsonValue
if(!in_args.isObject() || !in_args.toObject().contains("action") ){ return RestOutputStruct::BADREQUEST; }
QString act = in_args.toObject().value("action").toString();
if(act=="list_pools"){
bool ok = false;
QStringList info = sysadm::General::RunCommand(ok, "zpool list").split("\n");
if(ok && info.length()>1){ //first line is headers
//Line Format (3/2/16): Name/Size/Alloc/Free/Expandsz/Frag/Cap/Dedup/Health/Altroot
for(int i=1; i<info.length(); i++){
if(info[i].isEmpty()){ continue; }
info[i].replace("\t"," ");
QString name = info[i].section(" ",0,0,QString::SectionSkipEmpty);
QJsonObject obj;
obj.insert("size",info[i].section(" ",1,1,QString::SectionSkipEmpty) );
obj.insert("alloc",info[i].section(" ",2,2,QString::SectionSkipEmpty) );
obj.insert("free",info[i].section(" ",3,3,QString::SectionSkipEmpty) );
obj.insert("expandsz",info[i].section(" ",4,4,QString::SectionSkipEmpty) );
obj.insert("frag",info[i].section(" ",5,5,QString::SectionSkipEmpty) );
obj.insert("cap",info[i].section(" ",6,6,QString::SectionSkipEmpty) );
obj.insert("dedup",info[i].section(" ",7,7,QString::SectionSkipEmpty) );
obj.insert("health",info[i].section(" ",8,8,QString::SectionSkipEmpty) );
obj.insert("altroot",info[i].section(" ",9,9,QString::SectionSkipEmpty) );
out->insert(name,obj);
}
}
QJsonObject pools = sysadm::ZFS::zpool_list();
if(!pools.isEmpty()){ out->insert("list_pools",pools); }
}else{
//unknown action
return RestOutputStruct::BADREQUEST;