diff options
| author | Dan Engelbrecht <[email protected]> | 2023-04-21 09:53:53 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-04-21 09:53:53 +0200 |
| commit | b6a17ff67f938127865a6e43e0373e5a314e4402 (patch) | |
| tree | 492b11d158161efa0fe0cdacc3cb6484b7d427ff | |
| parent | oplog and cache stats (#244) (diff) | |
| download | zen-b6a17ff67f938127865a6e43e0373e5a314e4402.tar.xz zen-b6a17ff67f938127865a6e43e0373e5a314e4402.zip | |
Fix sentry init (#250)
* Sentry does not like UNC paths. Strip them before passing them to sentry
* changelog
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | zenserver/zenserver.cpp | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c57bc2c6c..8380bf3c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ - Feature: Payloads from zenserver can now be sent using duplicated file handles if caller requests provides client ProcessId (Windows only). - Bugfix: Make sure async responses are sent async correctly in httpsys - Bugfix: Don't delete manifest file in cas root when initializing a new filecas folder +- Bugfix: Sentry does not like UNC paths, so strip the prefix before passing them to sentry - Improvement: FileCas now keeps an up to date index of all the entries improving performance when getting cache misses on large payloads - Improvement: Structured cache now keeps RawHash and RawSize in memory avoiding materialization of cache values before sending response - Changed: Exit with failure code on port conflict rather than reporting crash to Sentry diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index 749f762f0..f4fd130b1 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -921,9 +921,18 @@ ZenEntryPoint::Run() { sentry_options_t* SentryOptions = sentry_options_new(); sentry_options_set_dsn(SentryOptions, "https://[email protected]/5919284"); + if (SentryDatabasePath.starts_with("\\\\?\\")) + { + SentryDatabasePath = SentryDatabasePath.substr(4); + } sentry_options_set_database_path(SentryOptions, SentryDatabasePath.c_str()); sentry_options_set_logger(SentryOptions, SentryLogFunction, this); - sentry_options_add_attachment(SentryOptions, m_ServerOptions.AbsLogFile.string().c_str()); + std::string SentryAttachmentPath = m_ServerOptions.AbsLogFile.string(); + if (SentryAttachmentPath.starts_with("\\\\?\\")) + { + SentryAttachmentPath = SentryAttachmentPath.substr(4); + } + sentry_options_add_attachment(SentryOptions, SentryAttachmentPath.c_str()); sentry_options_set_release(SentryOptions, ZEN_CFG_VERSION); // sentry_options_set_debug(SentryOptions, 1); |