flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 17:35:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

T79 Improved log messages.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2017-05-11 16:37:54 +01:00
parent 57b39dcd37
commit f34c48cf6c
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/filelogger.cpp
View File

@@ -124,7 +124,7 @@ namespace BlackMisc
m_stream << " " << QSysInfo::currentCpuArchitecture() << endl; m_stream << " " << QSysInfo::currentCpuArchitecture() << endl;
m_stream << "Built from revision " << CBuildConfig::gitHeadSha1(); 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 << "Built with Qt " << QT_VERSION_STR;
m_stream << " and running with Qt " << qVersion(); m_stream << " and running with Qt " << qVersion();

2
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -728,7 +728,7 @@ namespace BlackSimPlugin
} }
else 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_conn = CSimulatorXPlane::connectionFromString(m_xswiftbusServerSetting.getThreadLocal());
m_watcher = new QDBusServiceWatcher(xswiftbusServiceName(), m_conn, QDBusServiceWatcher::WatchForRegistration, this); m_watcher = new QDBusServiceWatcher(xswiftbusServiceName(), m_conn, QDBusServiceWatcher::WatchForRegistration, this);
connect(m_watcher, &QDBusServiceWatcher::serviceRegistered, this, &CSimulatorXPlaneListener::ps_serviceRegistered); connect(m_watcher, &QDBusServiceWatcher::serviceRegistered, this, &CSimulatorXPlaneListener::ps_serviceRegistered);

5
src/xswiftbus/plugin.cpp
View File

@@ -57,10 +57,11 @@ namespace XSwiftBus
#endif #endif
BlackMisc::setCustomLibraryPath(libraryPath); 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; 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); }); QTimer::singleShot(msec, this, [&] { tryStartServer(address); });
BlackMisc::setCustomLibraryPath(previousLibraryPath); BlackMisc::setCustomLibraryPath(previousLibraryPath);
return; return;