From f34c48cf6c09c8b1df267cdf524b5ffae9878fa1 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Thu, 11 May 2017 16:37:54 +0100 Subject: [PATCH] T79 Improved log messages. --- src/blackmisc/filelogger.cpp | 2 +- src/plugins/simulator/xplane/simulatorxplane.cpp | 2 +- src/xswiftbus/plugin.cpp | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/blackmisc/filelogger.cpp b/src/blackmisc/filelogger.cpp index 2578134eb..b9c5da887 100644 --- a/src/blackmisc/filelogger.cpp +++ b/src/blackmisc/filelogger.cpp @@ -124,7 +124,7 @@ namespace BlackMisc m_stream << " " << QSysInfo::currentCpuArchitecture() << endl; m_stream << "Built from revision " << CBuildConfig::gitHeadSha1(); - m_stream << " on " << CBuildConfig::buildTimestamp().toString() << endl; + m_stream << " on " << CBuildConfig::buildDateAndTime() << endl; m_stream << "Built with Qt " << QT_VERSION_STR; m_stream << " and running with Qt " << qVersion(); diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index 5192a057b..064b21f5f 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -728,7 +728,7 @@ namespace BlackSimPlugin } else { - CLogMessage(this).debug() << "Starting XSwiftBus on" << m_xswiftbusServerSetting.getThreadLocal(); + CLogMessage(this).debug() << "Watching XSwiftBus on" << m_xswiftbusServerSetting.getThreadLocal(); m_conn = CSimulatorXPlane::connectionFromString(m_xswiftbusServerSetting.getThreadLocal()); m_watcher = new QDBusServiceWatcher(xswiftbusServiceName(), m_conn, QDBusServiceWatcher::WatchForRegistration, this); connect(m_watcher, &QDBusServiceWatcher::serviceRegistered, this, &CSimulatorXPlaneListener::ps_serviceRegistered); diff --git a/src/xswiftbus/plugin.cpp b/src/xswiftbus/plugin.cpp index 0ab50ff19..f989c7ac9 100644 --- a/src/xswiftbus/plugin.cpp +++ b/src/xswiftbus/plugin.cpp @@ -57,10 +57,11 @@ namespace XSwiftBus #endif BlackMisc::setCustomLibraryPath(libraryPath); - if (!BlackMisc::CDBusServer::isP2PAddress(address) && !BlackMisc::CDBusServer::isDBusAvailable(address)) + QString message; + if (!BlackMisc::CDBusServer::isP2PAddress(address) && !BlackMisc::CDBusServer::isDBusAvailable(address, message)) { constexpr int msec = 30000; - BlackMisc::CLogMessage(this).warning("DBus daemon not available. Trying again in %1 sec.") << msec / 1000; + BlackMisc::CLogMessage(this).warning("DBus daemon not available. (%1) Trying again in %2 sec.") << message << (msec / 1000); QTimer::singleShot(msec, this, [&] { tryStartServer(address); }); BlackMisc::setCustomLibraryPath(previousLibraryPath); return;