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

Journald: Only emit signals for PIDs running on the current machine

Browse Source 
Change-Id: Ie4ea04b3505a5f3a9ba1b32eeb1e74fc28353737
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-03-02 11:15:17 +01:00
parent b0f3157d25
commit 510667ec2e
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,6 @@
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QDebug>
#include <QSocketNotifier> #include <QSocketNotifier>
#include <systemd/sd-journal.h> #include <systemd/sd-journal.h>
@@ -153,6 +152,17 @@ JournaldWatcher *JournaldWatcher::instance()
return m_instance; return m_instance;
} }
const QByteArray &JournaldWatcher::machineId()
{
static QByteArray id;
if (id.isEmpty()) {
sd_id128 sdId;
if (sd_id128_get_machine(&sdId) == 0)
id = QByteArray(reinterpret_cast<char *>(sdId.bytes), 16);
}
return id;
}
bool JournaldWatcher::subscribe(QObject *subscriber, const Subscription &subscription) bool JournaldWatcher::subscribe(QObject *subscriber, const Subscription &subscription)
{ {
// Check that we do not have that subscriber yet: // Check that we do not have that subscriber yet:
@@ -196,8 +206,7 @@ JournaldWatcher::JournaldWatcher()
void JournaldWatcher::handleEntry() void JournaldWatcher::handleEntry()
{ {
// process events: if (!d->m_notifier)
if (!d->m_notifier || sd_journal_process(d->m_journalContext) == SD_JOURNAL_NOP)
return; return;
LogEntry logEntry; LogEntry logEntry;
@@ -209,12 +218,15 @@ void JournaldWatcher::handleEntry()
foreach (const JournaldWatcherPrivate::SubscriberInformation &info, d->m_subscriptions) foreach (const JournaldWatcherPrivate::SubscriberInformation &info, d->m_subscriptions)
info.subscription(logEntry); info.subscription(logEntry);
QByteArray tmp = logEntry.value(QByteArrayLiteral("_PID")); if (logEntry.value(QByteArrayLiteral("_MACHINE_ID")) != machineId())
quint64 pid = tmp.isEmpty() ? 0 : QString::fromLatin1(tmp).toInt(); continue;
const QByteArray pid = logEntry.value(QByteArrayLiteral("_PID"));
quint64 pidNum = pid.isEmpty() ? 0 : QString::fromLatin1(pid).toInt();
QString message = QString::fromUtf8(logEntry.value(QByteArrayLiteral("MESSAGE"))); QString message = QString::fromUtf8(logEntry.value(QByteArrayLiteral("MESSAGE")));
emit journaldOutput(pid, message); emit journaldOutput(pidNum, message);
} }
} }

4
src/plugins/projectexplorer/journaldwatcher.h
View File

@@ -31,6 +31,8 @@
#ifndef JOURNALDWATCHER_H #ifndef JOURNALDWATCHER_H
#define JOURNALDWATCHER_H #define JOURNALDWATCHER_H
#include <QByteArray>
#include <QMap>
#include <QObject> #include <QObject>
#include <functional> #include <functional>
@@ -51,6 +53,8 @@ public:
static JournaldWatcher *instance(); static JournaldWatcher *instance();
static const QByteArray &machineId();
static bool subscribe(QObject *subscriber, const Subscription &subscription); static bool subscribe(QObject *subscriber, const Subscription &subscription);
static void unsubscribe(QObject *subscriber); static void unsubscribe(QObject *subscriber);