FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Error reports: default to SG_LOG(SG_ALERT

Browse Source 
When no callback is registered, just fall back to a plain SG_ALERT
This commit is contained in:
James Turner 2021-04-23 12:46:48 +01:00
parent ede4484b8d
commit fa40a6d1b8
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
simgear/debug/ErrorReportingCallback.cxx
View File

@ -16,6 +16,7 @@
#include <simgear_config.h> #include <simgear_config.h>
#include "ErrorReportingCallback.hxx" #include "ErrorReportingCallback.hxx"
#include "logstream.hxx"
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
@ -27,6 +28,31 @@ static ErrorReportCallback static_callback;
static ContextCallback static_contextCallback; static ContextCallback static_contextCallback;
string_list static_errorNames = {
"shader/effect",
"loading texture",
"XML/animation load",
"3D model load",
"loading BTG",
"sceanrio load",
"UI dialog load",
"loading Audio/FX",
"Nasal/commnad load of XML",
"aircraft-systems",
"loading input/joystick config",
"load AI/traffic",
"from TerraSync"};
string_list static_errorTypeNames = {
"unknown",
"not found",
"out of memory",
"bad header",
"bad data",
"misconfigured",
"disk IO/permissions",
"network IO"};
void setErrorReportCallback(ErrorReportCallback cb) void setErrorReportCallback(ErrorReportCallback cb)
{ {
static_callback = cb; static_callback = cb;
@ -53,6 +79,7 @@ static FailureCallback static_failureCallback;
void reportFailure(LoadFailure type, ErrorCode code, const std::string& details, sg_location loc) void reportFailure(LoadFailure type, ErrorCode code, const std::string& details, sg_location loc)
{ {
if (!static_failureCallback) { if (!static_failureCallback) {
SG_LOG(SG_GENERAL, SG_WARN, "Error:" << static_errorTypeNames.at(static_cast<int>(type)) << " from " << static_errorNames.at(static_cast<int>(code)) << "::" << details << "\n\t" << loc.asString());
return; return;
} }
@ -62,6 +89,9 @@ void reportFailure(LoadFailure type, ErrorCode code, const std::string& details,
void reportFailure(LoadFailure type, ErrorCode code, const std::string& details, const SGPath& path) void reportFailure(LoadFailure type, ErrorCode code, const std::string& details, const SGPath& path)
{ {
if (!static_failureCallback) { if (!static_failureCallback) {
// if no callback is registered, log here instead
SG_LOG(SG_GENERAL, SG_WARN, "Error:" << static_errorTypeNames.at(static_cast<int>(type)) << " from " << static_errorNames.at(static_cast<int>(code)) << "::" << details << "\n\t" << path);
return; return;
} }