BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2025-07-04 00:36:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix curl, print segfault

Browse Source
This commit is contained in:
Lion Kortlepel 2021-08-09 00:41:16 +02:00 committed by Lion
parent 9fe1a94d42
commit a7c28a8d0d
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -7,6 +7,15 @@ project(BeamMP-Server
message(STATUS "You can find build instructions and a list of dependencies in the README at \ message(STATUS "You can find build instructions and a list of dependencies in the README at \
https://github.com/BeamMP/BeamMP-Server") https://github.com/BeamMP/BeamMP-Server")
set(BUILD_CURL_EXE OFF)
set(BUILD_SHARED_LIBS ON)
set(CURL_WERROR OFF)
if (WIN32)
set(CURL_STATIC_CRT ON)
endif()
add_subdirectory("include/curl")
add_subdirectory("include/sentry-native") add_subdirectory("include/sentry-native")
message(STATUS "Setting compiler flags") message(STATUS "Setting compiler flags")
@ -18,7 +27,6 @@ if (WIN32)
set(VcpkgRoot ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}) set(VcpkgRoot ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET})
include_directories(${VcpkgRoot}/include) include_directories(${VcpkgRoot}/include)
link_directories(${VcpkgRoot}/lib) link_directories(${VcpkgRoot}/lib)
set(CURL_STATIC_CRT ON)
elseif (UNIX) elseif (UNIX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -static-libstdc++") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -static-libstdc++")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g")
@ -29,11 +37,6 @@ elseif (UNIX)
endif (SANITIZE) endif (SANITIZE)
endif () endif ()
set(BUILD_CURL_EXE OFF)
set(BUILD_SHARED_LIBS ON)
set(CURL_WERROR OFF)
add_subdirectory("include/curl")
message(STATUS "Checking for Sentry URL") message(STATUS "Checking for Sentry URL")
# this is set by the build system. # this is set by the build system.
# IMPORTANT: if you're building from source, just leave this empty # IMPORTANT: if you're building from source, just leave this empty

1
include/Sentry.h
View File

@ -12,6 +12,7 @@ public:
TSentry(const std::string& SentryUrl); TSentry(const std::string& SentryUrl);
~TSentry(); ~TSentry();
void PrintWelcome();
void Log(sentry_level_t level, const std::string& logger, const std::string& text); void Log(sentry_level_t level, const std::string& logger, const std::string& text);
void AddExtra(const std::string& key, const sentry_value_t& value); void AddExtra(const std::string& key, const sentry_value_t& value);
void AddExtra(const std::string& key, const std::string& value); void AddExtra(const std::string& key, const std::string& value);

10
src/Sentry.cpp
View File

@ -4,7 +4,6 @@
TSentry::TSentry(const std::string& SentryUrl) { TSentry::TSentry(const std::string& SentryUrl) {
if (SentryUrl.empty()) { if (SentryUrl.empty()) {
mValid = false; mValid = false;
info("Sentry disabled in unofficial build");
} else { } else {
mValid = true; mValid = true;
sentry_options_t* options = sentry_options_new(); sentry_options_t* options = sentry_options_new();
@ -13,7 +12,6 @@ TSentry::TSentry(const std::string& SentryUrl) {
sentry_options_set_release(options, ReleaseString.c_str()); sentry_options_set_release(options, ReleaseString.c_str());
sentry_options_set_max_breadcrumbs(options, 10); sentry_options_set_max_breadcrumbs(options, 10);
sentry_init(options); sentry_init(options);
info("Sentry started");
} }
} }
@ -23,6 +21,14 @@ TSentry::~TSentry() {
} }
} }
void TSentry::PrintWelcome() {
if (mValid) {
info("Sentry started");
} else {
info("Sentry disabled in unofficial build");
}
}
void TSentry::Log(sentry_level_t level, const std::string& logger, const std::string& text) { void TSentry::Log(sentry_level_t level, const std::string& logger, const std::string& text) {
if (!mValid) { if (!mValid) {
return; return;

1
src/main.cpp
View File

@ -55,7 +55,6 @@ int main(int argc, char** argv) try {
bool Shutdown = false; bool Shutdown = false;
Application::RegisterShutdownHandler([&Shutdown] { Shutdown = true; }); Application::RegisterShutdownHandler([&Shutdown] { Shutdown = true; });
TServer Server(argc, argv); TServer Server(argc, argv);
TConfig Config; TConfig Config;