mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2026-01-11 23:25:57 +01:00
2019-01-09 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdpadengined(8) that caused PyPAD script errors to fail to be logged.
This commit is contained in:
@@ -31,6 +31,8 @@ RDProcess::RDProcess(int id,QObject *parent)
|
||||
connect(p_process,SIGNAL(started()),this,SLOT(startedData()));
|
||||
connect(p_process,SIGNAL(finished(int,QProcess::ExitStatus)),
|
||||
this,SLOT(finishedData(int,QProcess::ExitStatus)));
|
||||
connect(p_process,SIGNAL(readyReadStandardError()),
|
||||
this,SLOT(readyReadStandardErrorData()));
|
||||
}
|
||||
|
||||
|
||||
@@ -103,6 +105,12 @@ void RDProcess::finishedData(int exit_code,QProcess::ExitStatus status)
|
||||
}
|
||||
|
||||
|
||||
void RDProcess::readyReadStandardErrorData()
|
||||
{
|
||||
p_standard_error_data+=process()->readAllStandardError();
|
||||
}
|
||||
|
||||
|
||||
void *RDProcess::privateData() const
|
||||
{
|
||||
return p_private_data;
|
||||
@@ -113,3 +121,9 @@ void RDProcess::setPrivateData(void *priv)
|
||||
{
|
||||
p_private_data=priv;
|
||||
}
|
||||
|
||||
|
||||
QByteArray RDProcess::standardErrorData() const
|
||||
{
|
||||
return p_standard_error_data;
|
||||
}
|
||||
|
||||
@@ -37,6 +37,7 @@ class RDProcess : public QObject
|
||||
QString errorText() const;
|
||||
void *privateData() const;
|
||||
void setPrivateData(void *priv);
|
||||
QByteArray standardErrorData() const;
|
||||
|
||||
signals:
|
||||
void started(int id);
|
||||
@@ -45,6 +46,7 @@ class RDProcess : public QObject
|
||||
private slots:
|
||||
void startedData();
|
||||
void finishedData(int exit_code,QProcess::ExitStatus status);
|
||||
void readyReadStandardErrorData();
|
||||
|
||||
private:
|
||||
int p_id;
|
||||
@@ -53,6 +55,7 @@ class RDProcess : public QObject
|
||||
QProcess *p_process;
|
||||
QString p_error_text;
|
||||
void *p_private_data;
|
||||
QByteArray p_standard_error_data;
|
||||
};
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user