flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 21:56:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #316 Removed old logging mechanism in contexts.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2014-09-25 21:19:08 +01:00
parent d7a2fa3dea
commit b1c74d81e5
13 changed files with 2 additions and 653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
src/blackcore/context_application.cpp
View File

@@ -13,7 +13,6 @@ using namespace BlackMisc::Settings;
namespace BlackCore
{
QList<IContextApplication *> IContextApplication::s_contexts;
QtMessageHandler IContextApplication::s_oldHandler = nullptr;
IContextApplication *IContextApplication::create(CRuntime *parent, CRuntimeConfig::ContextMode mode, CDBusServer *server, QDBusConnection &conn)
@@ -31,29 +30,11 @@ namespace BlackCore
}
}
IContextApplication::RedirectionLevel IContextApplication::getOutputRedirectionLevel() const
{
QReadLocker(&this->m_lock);
return this->m_outputRedirectionLevel;
}
void IContextApplication::setOutputRedirectionLevel(IContextApplication::RedirectionLevel redirectionLevel)
{
QWriteLocker(&this->m_lock);
this->m_outputRedirectionLevel = redirectionLevel;
}
IContextApplication::RedirectionLevel IContextApplication::getStreamingForRedirectedOutputLevel() const
{
QReadLocker(&this->m_lock);
return this->m_redirectedOutputRedirectionLevel;
}
/*
* Constructor
*/
IContextApplication::IContextApplication(CRuntimeConfig::ContextMode mode, CRuntime *runtime) :
CContext(mode, runtime), m_outputRedirectionLevel(IContextApplication::RedirectNone), m_redirectedOutputRedirectionLevel(IContextApplication::RedirectNone)
CContext(mode, runtime)
{
if (IContextApplication::s_contexts.isEmpty())
{
@@ -64,28 +45,6 @@ namespace BlackCore
changeSettings(IContextSettings::SettingsHotKeys);
}
/*
* Output data from redirect signal
*/
void IContextApplication::setStreamingForRedirectedOutputLevel(RedirectionLevel redirectionLevel)
{
QWriteLocker(&this->m_lock);
disconnect(this, &IContextApplication::redirectedOutput, this, &IContextApplication::streamRedirectedOutput);
if (redirectionLevel != RedirectNone)
{
connect(this, &IContextApplication::redirectedOutput, this, &IContextApplication::streamRedirectedOutput);
}
this->m_redirectedOutputRedirectionLevel = redirectionLevel;
}
/*
* Reset output redirection
*/
void IContextApplication::resetOutputRedirection()
{
qInstallMessageHandler(0);
}
void IContextApplication::changeSettings(uint typeValue)
{
auto type = static_cast<IContextSettings::SettingsType>(typeValue);
@@ -107,83 +66,6 @@ namespace BlackCore
*/
void IContextApplication::messageHandlerDispatch(QtMsgType type, const QMessageLogContext &messageContext, const QString &message)
{
if (IContextApplication::s_oldHandler) IContextApplication::s_oldHandler(type, messageContext, message);
if (IContextApplication::s_contexts.isEmpty()) return;
foreach(IContextApplication *ctx, IContextApplication::s_contexts)
{
ctx->messageHandler(type, messageContext, message);
}
}
/*
* Handle message
*/
void IContextApplication::messageHandler(QtMsgType type, const QMessageLogContext &messageContext, const QString &message)
{
Q_UNUSED(messageContext);
RedirectionLevel outputRedirectionLevel = this->getOutputRedirectionLevel(); // local copy, thready safety
if (outputRedirectionLevel == RedirectNone) return;
CStatusMessage m(CStatusMessage::TypeStdoutRedirect, CStatusMessage::SeverityInfo, message);
switch (type)
{
case QtDebugMsg:
if (outputRedirectionLevel != RedirectAllOutput) return;
break;
case QtWarningMsg:
if (outputRedirectionLevel == RedirectAllOutput) return;
if (outputRedirectionLevel == RedirectError) return;
m.setSeverity(CStatusMessage::SeverityWarning);
break;
case QtCriticalMsg:
if (outputRedirectionLevel != RedirectError) return;
m.setSeverity(CStatusMessage::SeverityError);
break;
case QtFatalMsg:
if (m_outputRedirectionLevel != RedirectError) return;
m.setSeverity(CStatusMessage::SeverityError);
break;
default:
break;
}
// emit signal, based on thread id
if (QThread::currentThread() == this->thread())
{
// same thread, can emit directly
emit this->redirectedOutput(m, this->getUniqueId());
}
else
{
// Different threads, use invoke so that is called in "main / object's thread"
// Otherwise for DBus: QtDBus: cannot relay signals from parent BlackCore::CContextApplication(0x4b4358 "") unless they are emitted in the object's thread QThread(0x4740b0 ""). Current thread is QThread(0x4b5530 "Thread (pooled)")
QMetaObject::invokeMethod(this, "redirectedOutput", Q_ARG(BlackMisc::CStatusMessage, m), Q_ARG(qint64, this->getUniqueId()));
}
}
/*
* Redirected output
*/
void IContextApplication::streamRedirectedOutput(const CStatusMessage &message, qint64 contextId)
{
if (this->getUniqueId() == contextId) return; // avoid infinite output
RedirectionLevel redirectedOutputRedirectionLevel = this->getStreamingForRedirectedOutputLevel(); // local copy
if (message.isEmpty()) return;
switch (message.getSeverity())
{
case CStatusMessage::SeverityInfo:
if (redirectedOutputRedirectionLevel != RedirectAllOutput) return;
qDebug() << message.getMessage();
break;
case CStatusMessage::SeverityWarning:
if (redirectedOutputRedirectionLevel == RedirectAllOutput) return;
if (redirectedOutputRedirectionLevel == RedirectError) return;
qWarning() << message.getMessage();
break;
case CStatusMessage::SeverityError:
if (redirectedOutputRedirectionLevel != RedirectError) return;
qCritical() << message.getMessage();
break;
}
}
} // namespace