From f54605e1ea9512f72d10823885f9e8be5af0e3ea Mon Sep 17 00:00:00 2001 From: David Capello Date: Mon, 5 Sep 2022 16:21:45 -0300 Subject: [PATCH 1/3] Fix typo with SENTRY_DSN option name --- CMakeLists.txt | 2 +- src/app/CMakeLists.txt | 2 +- src/app/sentry_wrapper.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e9814380d..4fdf0a71d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,7 +79,7 @@ set(CUSTOM_WEBSITE_URL "" CACHE STRING "Enable custom local webserver to check u if(ENABLE_SENTRY) set(SENTRY_DIR "" CACHE STRING "Sentry native location") - set(SENTRY_DNS "" CACHE STRING "Sentry DNS URL") + set(SENTRY_DSN "" CACHE STRING "Sentry Data Source Name URL") endif() if(ENABLE_NEWS OR ENABLE_UPDATER) diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index c42768ff6..1b3e93ee2 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -703,7 +703,7 @@ if(ENABLE_SENTRY) target_compile_definitions(app-lib PUBLIC -DENABLE_SENTRY -DSENTRY_BUILD_STATIC=1 - -DSENTRY_DNS="${SENTRY_DNS}") + -DSENTRY_DSN="${SENTRY_DSN}") add_subdirectory(${SENTRY_DIR} sentry) target_link_libraries(app-lib sentry) endif() diff --git a/src/app/sentry_wrapper.cpp b/src/app/sentry_wrapper.cpp index b70e07c46..250893dbe 100644 --- a/src/app/sentry_wrapper.cpp +++ b/src/app/sentry_wrapper.cpp @@ -26,7 +26,7 @@ std::string Sentry::m_dbdir; void Sentry::init() { sentry_options_t* options = sentry_options_new(); - sentry_options_set_dsn(options, SENTRY_DNS); + sentry_options_set_dsn(options, SENTRY_DSN); std::string release = "aseprite@"; release += get_app_version(); From 03148f9c7c7cfdeb992c3fca85af6b0f261657aa Mon Sep 17 00:00:00 2001 From: David Capello Date: Mon, 5 Sep 2022 16:28:44 -0300 Subject: [PATCH 2/3] Add SENTRY_ENV option --- CMakeLists.txt | 1 + src/app/CMakeLists.txt | 3 ++- src/app/sentry_wrapper.cpp | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fdf0a71d..8319afbbd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,6 +80,7 @@ set(CUSTOM_WEBSITE_URL "" CACHE STRING "Enable custom local webserver to check u if(ENABLE_SENTRY) set(SENTRY_DIR "" CACHE STRING "Sentry native location") set(SENTRY_DSN "" CACHE STRING "Sentry Data Source Name URL") + set(SENTRY_ENV "development" CACHE STRING "Sentry environment (production, testing, development, etc.)") endif() if(ENABLE_NEWS OR ENABLE_UPDATER) diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 1b3e93ee2..810d79493 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -703,7 +703,8 @@ if(ENABLE_SENTRY) target_compile_definitions(app-lib PUBLIC -DENABLE_SENTRY -DSENTRY_BUILD_STATIC=1 - -DSENTRY_DSN="${SENTRY_DSN}") + -DSENTRY_DSN="${SENTRY_DSN}" + -DSENTRY_ENV="${SENTRY_ENV}") add_subdirectory(${SENTRY_DIR} sentry) target_link_libraries(app-lib sentry) endif() diff --git a/src/app/sentry_wrapper.cpp b/src/app/sentry_wrapper.cpp index 250893dbe..fb3a97838 100644 --- a/src/app/sentry_wrapper.cpp +++ b/src/app/sentry_wrapper.cpp @@ -27,6 +27,7 @@ void Sentry::init() { sentry_options_t* options = sentry_options_new(); sentry_options_set_dsn(options, SENTRY_DSN); + sentry_options_set_environment(options, SENTRY_ENV); std::string release = "aseprite@"; release += get_app_version(); From 9b917fe1976a5a8e3fd2475df16e698e55385646 Mon Sep 17 00:00:00 2001 From: David Capello Date: Fri, 9 Sep 2022 13:52:40 -0300 Subject: [PATCH 3/3] Update laf module --- laf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laf b/laf index 758319cc4..8f91e164d 160000 --- a/laf +++ b/laf @@ -1 +1 @@ -Subproject commit 758319cc494b9293c632415b61404a1cf3177503 +Subproject commit 8f91e164d1d23a3b0dc751bc0f9185af27dcb2c7