diff options
| author | Dan Engelbrecht <[email protected]> | 2024-05-03 15:09:35 +0200 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2024-05-03 15:09:35 +0200 |
| commit | 75b91b3f2eb21332a35255eae3c523ad2d2e9bc7 (patch) | |
| tree | d0db8b85af12bff7acbfe8a8e091169e89307b8b /src/zenserver/sentryintegration.cpp | |
| parent | 5.5.1 (diff) | |
| download | zen-75b91b3f2eb21332a35255eae3c523ad2d2e9bc7.tar.xz zen-75b91b3f2eb21332a35255eae3c523ad2d2e9bc7.zip | |
assert improvements (#72)
- Improvement: Asserts gives an immediate ERROR log entry with callstack and reason
- Improvement: Asserts flushes the log before sending error report to Sentry
Diffstat (limited to 'src/zenserver/sentryintegration.cpp')
| -rw-r--r-- | src/zenserver/sentryintegration.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/zenserver/sentryintegration.cpp b/src/zenserver/sentryintegration.cpp index a8d967985..2f68a269b 100644 --- a/src/zenserver/sentryintegration.cpp +++ b/src/zenserver/sentryintegration.cpp @@ -31,10 +31,8 @@ namespace sentry { struct SentryAssertImpl : zen::AssertImpl { - virtual void ZEN_FORCENOINLINE ZEN_DEBUG_SECTION OnAssert(const char* Filename, - int LineNumber, - const char* FunctionName, - const char* Msg) override; + virtual void ZEN_FORCENOINLINE ZEN_DEBUG_SECTION + OnAssert(const char* Filename, int LineNumber, const char* FunctionName, const char* Msg, zen::CallstackFrames* Callstack) override; }; class sentry_sink final : public spdlog::sinks::base_sink<spdlog::details::null_mutex> @@ -103,8 +101,10 @@ sentry_sink::flush_() } void -SentryAssertImpl::OnAssert(const char* Filename, int LineNumber, const char* FunctionName, const char* Msg) +SentryAssertImpl::OnAssert(const char* Filename, int LineNumber, const char* FunctionName, const char* Msg, zen::CallstackFrames* Callstack) { + // Sentry will provide its own callstack + ZEN_UNUSED(Callstack); try { std::string Message = fmt::format("ASSERT {}:({}) [{}]\n\"{}\"", Filename, LineNumber, FunctionName, Msg); |