fly/flightgear
1
0
Fork 0
Code Activity

Sentry: add reporting for common path errors

Browse source 
Adding bread-crumbs preceding common failures seen on Sentry, around
addon and aircraft loading.
This commit is contained in:
James Turner 2020-12-27 17:24:50 +00:00
parent b86baa68c0
commit 7f5f7e0b11
2 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/GUI/AddOnsController.cxx
View file

@ -12,6 +12,7 @@
#include <simgear/package/Catalog.hxx>
#include <Main/globals.hxx>
#include <Main/sentryIntegration.hxx>
#include <Network/HTTPClient.hxx>
#include "Add-ons/Addon.hxx"
@ -150,6 +151,8 @@ QString AddOnsController::addAircraftPath() const
if (mb.result() == QMessageBox::No) {
return {};
}
flightgear::addSentryBreadcrumb("User continued adding add-on with invalid path", "info");
}
m_aircraftPaths->appendPath(path);

41
src/Main/fg_init.cxx
View file

@ -235,13 +235,14 @@ public:
try {
readProperties(setFile, globals->get_props());
} catch ( const sg_exception &e ) {
SG_LOG(SG_INPUT, SG_ALERT,
"Error reading aircraft: " << e.getFormattedMessage());
flightgear::fatalMessageBoxWithoutExit(
"Error reading aircraft",
"An error occured reading the requested aircraft (" + aircraft + ")",
e.getFormattedMessage());
return false;
SG_LOG(SG_IO, SG_ALERT,
"Error reading aircraft: " << e.getFormattedMessage());
SG_LOG(SG_IO, SG_ALERT, "aircraft dir is:" << aircraftDir);
flightgear::fatalMessageBoxWithoutExit(
"Error reading aircraft",
"An error occured reading the requested aircraft (" + aircraft + ")",
e.getFormattedMessage());
return false;
}
checkAircraftMinVersion();
@ -262,14 +263,16 @@ public:
}
if (!checkCache()) {
// prepare cache for re-scan
SGPropertyNode *n = _cache->getNode("fg-root", true);
n->setStringValue(globals->get_fg_root().utf8Str());
n->setAttribute(SGPropertyNode::USERARCHIVE, true);
n = _cache->getNode("fg-aircraft", true);
n->setStringValue(getAircraftPaths().c_str());
n->setAttribute(SGPropertyNode::USERARCHIVE, true);
_cache->removeChildren("aircraft");
flightgear::addSentryBreadcrumb("Scanning aircraft paths", "info");
// prepare cache for re-scan
SGPropertyNode* n = _cache->getNode("fg-root", true);
n->setStringValue(globals->get_fg_root().utf8Str());
n->setAttribute(SGPropertyNode::USERARCHIVE, true);
n = _cache->getNode("fg-aircraft", true);
n->setStringValue(getAircraftPaths().c_str());
n->setAttribute(SGPropertyNode::USERARCHIVE, true);
_cache->removeChildren("aircraft");
visitAircraftPaths();
}
@ -277,6 +280,9 @@ public:
if (_foundPath.isNull()) {
SG_LOG(SG_GENERAL, SG_ALERT,
"Cannot find the specified aircraft: '" << aircraft << "'");
SG_LOG(SG_GENERAL, SG_ALERT, "\tin paths:" << SGPath::join(globals->get_aircraft_paths(), ";"));
flightgear::fatalMessageBoxWithoutExit(
"Aircraft not found",
"The requested aircraft (" + aircraft + ") could not be found "
@ -337,8 +343,9 @@ private:
SGPath xml(cache[i]->getStringValue("path", ""));
xml.append(name);
if (xml.exists()) {
_foundPath = xml;
return true;
flightgear::addSentryBreadcrumb("Found aircraft via cache", "info");
_foundPath = xml;
return true;
}
return false;