aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2024-03-28 15:08:18 +0100
committerGitHub Enterprise <[email protected]>2024-03-28 15:08:18 +0100
commitd6bcf58a65fe8cfcdc03f64ea0d05ee8fd859303 (patch)
treed91c7657d3f85d86d249fd4a152db3f56eda3204
parentUse multithreading to fetch size/rawsize of entries in `/prj/{project}/oplog/... (diff)
downloadzen-d6bcf58a65fe8cfcdc03f64ea0d05ee8fd859303.tar.xz
zen-d6bcf58a65fe8cfcdc03f64ea0d05ee8fd859303.zip
Fix sentry using wrong folder path when data path contains non-anscii characters (#32)
* Fix sentry using wrong folder path when data path contains non-ascii characters
-rw-r--r--CHANGELOG.md3
-rw-r--r--src/zenserver/main.cpp4
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a35daa74..f16b110cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
##
+- Bugfix: Fix sentry using wrong folder path when data path contains non-ascii characters UE-210530
- Improvement: Faster reading of compressed buffer headers by not materializing entire source buffer
- Bugfix: Get raw size for compressed chunks correctly for `/prj/{project}/oplog/{log}/chunkinfos`
- Improvement: It is now possible to control which fields to include in `/prj/{project}/oplog/{log}/chunkinfos` request by adding a comma delimited list of filed names for `fieldnames` parameter
@@ -19,7 +20,7 @@
- Bugfix: Make sure WriteFile() does not leave incomplete files
- Bugfix: Use TemporaryFile and MoveTemporaryIntoPlace to avoid leaving partial files on error
- Bugfix: Install Ctrl+C handler earlier when doing `zen oplog-export` and `zen oplog-export` to properly cancel jobs
-- Bugfix: Fix startup issues where data path contains non-anscii characters UE-210530
+- Bugfix: Fix startup issues where data path contains non-ascii characters UE-210530
- Feature: Added option `--access-token-path` to `zen oplog-export` and `zen-oplog-import` enabling it to read a cloud access token from a json file
- Feature: Added support for generating yaml format responses via Accept: yaml or .yaml suffix
- Improvement: Add ability to block a set of CAS entries from GC in project store
diff --git a/src/zenserver/main.cpp b/src/zenserver/main.cpp
index a9246ed8f..7a6d2dd22 100644
--- a/src/zenserver/main.cpp
+++ b/src/zenserver/main.cpp
@@ -89,8 +89,8 @@ ZenEntryPoint::Run()
if (m_ServerOptions.NoSentry == false)
{
- std::string SentryDatabasePath = PathToUtf8(m_ServerOptions.DataDir / ".sentry-native");
- std::string SentryAttachmentPath = PathToUtf8(m_ServerOptions.AbsLogFile);
+ std::string SentryDatabasePath = (m_ServerOptions.DataDir / ".sentry-native").string();
+ std::string SentryAttachmentPath = m_ServerOptions.AbsLogFile.string();
Sentry.Initialize(SentryDatabasePath, SentryAttachmentPath, m_ServerOptions.SentryAllowPII);
}