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

Fix the parsing of the lpreserver replicate list command in the sysadm server.

Browse Source
This commit is contained in:
Ken Moore
2016-08-02 11:10:33 -04:00
parent e6c589dc66
commit bdf59b5691
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -244,13 +244,13 @@ QJsonObject LifePreserver::listReplication() {
QStringList output = General::RunCommand("lpreserver replicate list").split("\n");
QStringList setitems;
QString tmpkey;
QRegExp sep("\\s+");
//QRegExp sep("\\s+");
// Parse the output
bool inSection = false;
for ( int i = 0; i < output.size(); i++)
{
if ( output.at(i).indexOf("-----------------") != -1 ) {
if ( !inSection && output.at(i).indexOf("-----------------") != -1 ) {
inSection = true;
continue;
}
@@ -265,13 +265,13 @@ QJsonObject LifePreserver::listReplication() {
QJsonObject values;
tmpkey = "";
QString dset, rdset, user, host, port, parseline, time;
dset = output.at(i).section(sep, 0, 0).simplified();
parseline = output.at(i).section(sep, 2, 2).simplified();
dset = output.at(i).section(" -> ", 0, 0).simplified();
parseline = output.at(i).section(" -> ", 1, -1).simplified();
user = parseline.section("@", 0, 0);
host = parseline.section("@", 1, 1).section("[", 0, 0);
port = parseline.section("@", 1, 1).section("[", 1, 1).section("]", 0, 0);
rdset = parseline.section(":", 1, 1);
time = output.at(i).section(sep, 4, 4).simplified();
time = output.at(i).section(" Time:", -1).simplified();
values.insert("dataset", dset);
values.insert("user", user);