feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Retrieve output from Journald more reliably

Browse Source 
Retrieve output from Journald more reliably.

Change-Id: Ic733698e7ed3717841a5a902c4f1e9e94d952885
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2017-02-27 11:49:00 +01:00
parent 18fe7b3c7e
commit ada3f4ba95
6 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/projectexplorer/journaldwatcher.cpp
View File

@@ -163,7 +163,7 @@ bool JournaldWatcher::subscribe(QObject *subscriber, const Subscription &subscri
[subscriber](const JournaldWatcherPrivate::SubscriberInformation &info) {
return info.subscriber == subscriber;
});
QTC_ASSERT(pos >= 0, return false);
QTC_ASSERT(pos < 0, return false);
d->m_subscriptions.append(JournaldWatcherPrivate::SubscriberInformation(subscriber, subscription));
connect(subscriber, &QObject::destroyed, m_instance, &JournaldWatcher::unsubscribe);
@@ -214,20 +214,6 @@ void JournaldWatcher::handleEntry()
foreach (const JournaldWatcherPrivate::SubscriberInformation &info, d->m_subscriptions)
info.subscription(logEntry);
if (logEntry.value(QByteArrayLiteral("_MACHINE_ID")) != machineId())
continue;
const QByteArray pid = logEntry.value(QByteArrayLiteral("_PID"));
if (pid.isEmpty())
continue;
quint64 pidNum = QString::fromLatin1(pid).toInt();
QString message = QString::fromUtf8(logEntry.value(QByteArrayLiteral("MESSAGE")));
message.append(QLatin1Char('\n')); // Add newline.
emit journaldOutput(pidNum, message);
}
}