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

Merge branch 'master' of https://github.com/pcbsd/sysadm

Browse Source
This commit is contained in:
Kris Moore
2016-02-29 14:44:35 -05:00
parent 2401da278d ef6f7ec39f
commit 269db2628e
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/Dispatcher.cpp
View File

@@ -14,6 +14,7 @@ DProcess::DProcess(QObject *parent) : QProcess(parent){
//Setup the process
this->setProcessEnvironment(QProcessEnvironment::systemEnvironment());
this->setProcessChannelMode(QProcess::MergedChannels);
connect(this, SIGNAL(readyRead()), this, SLOT(updateLog()) );
}
DProcess::~DProcess(){
@@ -87,6 +88,9 @@ void DProcess::cmdFinished(int ret, QProcess::ExitStatus status){
}
}
void DProcess::updateLog(){
emit ProcessOutput(getProcLog());
}
// ================================
// Dispatcher Class
// ================================

4
src/server/Dispatcher.h
View File

@@ -39,9 +39,13 @@ private:
private slots:
void cmdError(QProcess::ProcessError);
void cmdFinished(int, QProcess::ExitStatus);
void updateLog(); //readyRead() signal
signals:
void ProcFinished(QString); //ID
//Generic signals for subsystem usage (no direct proc access later)
void ProcessOutput(QString);
void Finished(QString, int, QString); //ID, retcode, log
};