diff options
| author | Rainer Keller <Rainer.Keller@qt.io> | 2018-01-24 13:51:41 +0100 |
|---|---|---|
| committer | Rainer Keller <Rainer.Keller@qt.io> | 2018-02-08 09:09:54 +0000 |
| commit | 1127f2829829610bc5951e2f253a47ed76a3008e (patch) | |
| tree | b076f17a65a67d036597a738529f648e8f9dccf7 | |
| parent | ade3c7f1978f608e3d1c9520552c7345939aa567 (diff) | |
Log network script output
All calls to network setup scripts and their output are logged for
debugging.
Change-Id: Iceb323134e91abe478d7f49b755347c37931f67d
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | qdbd/networkconfiguration.cpp | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/qdbd/networkconfiguration.cpp b/qdbd/networkconfiguration.cpp index 7394c9f..536c724 100644 --- a/qdbd/networkconfiguration.cpp +++ b/qdbd/networkconfiguration.cpp @@ -52,10 +52,18 @@ ConfigurationResult NetworkConfiguration::set(QString subnetString) m_subnetString = subnetString; QProcess process; - process.start(Configuration::networkScript(), QStringList{"--set", subnetString}); + process.setProcessChannelMode(QProcess::MergedChannels); + QObject::connect(&process, &QProcess::readyReadStandardOutput, &process, [&]() { + qCDebug(configurationC) << "Script:" << process.readAllStandardOutput(); + }); + + const QStringList args = QStringList{"--set", subnetString}; + qCDebug(configurationC) << "Running network configuration script" << Configuration::networkScript() << args; + process.start(Configuration::networkScript(), args); + process.waitForFinished(); if (process.exitCode() != 0) { - qCWarning(configurationC) << "Using script to configure the network failed"; + qCWarning(configurationC) << "Using script" << Configuration::networkScript() << "to configure the network failed"; m_subnetString.clear(); return ConfigurationResult::Failure; } @@ -70,7 +78,15 @@ bool NetworkConfiguration::reset() m_subnetString.clear(); QProcess process; - process.start(Configuration::networkScript(), QStringList{"--reset"}); + process.setProcessChannelMode(QProcess::MergedChannels); + QObject::connect(&process, &QProcess::readyReadStandardOutput, &process, [&]() { + qCDebug(configurationC) << "Script:" << process.readAllStandardOutput(); + }); + + const QStringList args = QStringList{"--reset"}; + qCDebug(configurationC) << "Running network configuration script" << Configuration::networkScript() << args; + process.start(Configuration::networkScript(), args); + process.waitForFinished(); if (process.exitCode() != 0) { qCWarning(configurationC) << "Using script" << Configuration::networkScript() |