mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-14 00:25:35 +08:00
Issue #15 Removed old log distribution code
This commit is contained in:
@@ -30,14 +30,6 @@ namespace BlackCore
|
||||
m_dBusInterface = new CGenericDBusInterface(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(), connection, this);
|
||||
this->relaySignals(serviceName, connection);
|
||||
|
||||
connect(this, &IContextApplication::messageLogged, this, [](const CStatusMessage & message, const CIdentifier & origin)
|
||||
{
|
||||
if (!origin.hasApplicationProcessId())
|
||||
{
|
||||
CLogHandler::instance()->logRemoteMessage(message);
|
||||
}
|
||||
});
|
||||
|
||||
connect(this, &CContextApplicationProxy::remoteHotkeyAction, this, &CContextApplicationProxy::processRemoteHotkeyActionCall);
|
||||
|
||||
m_pingTimer.setObjectName(serviceName + "::m_pingTimer");
|
||||
@@ -49,15 +41,6 @@ namespace BlackCore
|
||||
{
|
||||
// signals originating from impl side
|
||||
bool s = connection.connect(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(),
|
||||
"messageLogged", this, SIGNAL(messageLogged(BlackMisc::CStatusMessage, BlackMisc::CIdentifier)));
|
||||
Q_ASSERT(s);
|
||||
s = connection.connect(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(),
|
||||
"logSubscriptionAdded", this, SIGNAL(logSubscriptionAdded(BlackMisc::CIdentifier, BlackMisc::CLogPattern)));
|
||||
Q_ASSERT(s);
|
||||
s = connection.connect(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(),
|
||||
"logSubscriptionRemoved", this, SIGNAL(logSubscriptionRemoved(BlackMisc::CIdentifier, BlackMisc::CLogPattern)));
|
||||
Q_ASSERT(s);
|
||||
s = connection.connect(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(),
|
||||
"settingsChanged", this, SIGNAL(settingsChanged(BlackMisc::CValueCachePacket, BlackMisc::CIdentifier)));
|
||||
Q_ASSERT(s);
|
||||
s = connection.connect(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(),
|
||||
@@ -75,36 +58,6 @@ namespace BlackCore
|
||||
this->relayBaseClassSignals(serviceName, connection, IContextApplication::ObjectPath(), IContextApplication::InterfaceName());
|
||||
}
|
||||
|
||||
void CContextApplicationProxy::logMessage(const CStatusMessage &message, const CIdentifier &origin)
|
||||
{
|
||||
if (subscribersOf(message).containsAnyNotIn(CIdentifierList({ origin, {} })))
|
||||
{
|
||||
m_dBusInterface->callDBus(QLatin1String("logMessage"), message, origin);
|
||||
}
|
||||
}
|
||||
|
||||
void CContextApplicationProxy::addLogSubscription(const CIdentifier &subscriber, const CLogPattern &pattern)
|
||||
{
|
||||
m_dBusInterface->callDBus(QLatin1String("addLogSubscription"), subscriber, pattern);
|
||||
}
|
||||
|
||||
void CContextApplicationProxy::removeLogSubscription(const CIdentifier &subscriber, const CLogPattern &pattern)
|
||||
{
|
||||
m_dBusInterface->callDBus(QLatin1String("removeLogSubscription"), subscriber, pattern);
|
||||
}
|
||||
|
||||
CLogSubscriptionHash CContextApplicationProxy::getAllLogSubscriptions() const
|
||||
{
|
||||
return m_dBusInterface->callDBusRet<CLogSubscriptionHash>(QLatin1String("getAllLogSubscriptions"));
|
||||
}
|
||||
|
||||
void CContextApplicationProxy::synchronizeLogSubscriptions()
|
||||
{
|
||||
// note this proxy method does not call synchronizeLogSubscriptions in core
|
||||
m_logSubscriptions = this->getAllLogSubscriptions();
|
||||
for (const auto &pattern : CLogHandler::instance()->getAllSubscriptions()) { this->addLogSubscription({}, pattern); }
|
||||
}
|
||||
|
||||
void CContextApplicationProxy::changeSettings(const CValueCachePacket &settings, const CIdentifier &origin)
|
||||
{
|
||||
m_dBusInterface->callDBus(QLatin1String("changeSettings"), settings, origin);
|
||||
|
||||
Reference in New Issue
Block a user