diff --git a/extern/aurora b/extern/aurora index f8573d34e6..f1189541e5 160000 --- a/extern/aurora +++ b/extern/aurora @@ -1 +1 @@ -Subproject commit f8573d34e632aea81039526a728b34f373d247ef +Subproject commit f1189541e5d8b97fdf61946377853488d504d9df diff --git a/extern/borealis b/extern/borealis index 4b76f9ea35..08de28e885 160000 --- a/extern/borealis +++ b/extern/borealis @@ -1 +1 @@ -Subproject commit 4b76f9ea35eaa116a57fd732b1c4954b6f4d0316 +Subproject commit 08de28e885cd38a7c271a2d1ecd3f4f1c0620e06 diff --git a/src/dusk/mods/svc/http.cpp b/src/dusk/mods/svc/http.cpp index 337758d5d4..f533aa5832 100644 --- a/src/dusk/mods/svc/http.cpp +++ b/src/dusk/mods/svc/http.cpp @@ -183,7 +183,6 @@ HttpError map_error(borealis::http::Error error) { case borealis::http::Error::Io: return HTTP_ERROR_IO; case borealis::http::Error::NoBackend: - case borealis::http::Error::NotInitialized: case borealis::http::Error::Network: return HTTP_ERROR_NETWORK; default: @@ -438,14 +437,12 @@ ModResult start_request(LoadedMod& mod, const HttpRequestDesc& desc, HttpComplet .connectTimeout = desc.connect_timeout_ms != 0 ? std::chrono::milliseconds{desc.connect_timeout_ms} : DefaultTimeout, - .idleTimeout = desc.idle_timeout_ms != 0 ? - std::chrono::milliseconds{desc.idle_timeout_ms} : - DefaultTimeout, + .idleTimeout = desc.idle_timeout_ms != 0 ? std::chrono::milliseconds{desc.idle_timeout_ms} : + DefaultTimeout, .totalTimeout = desc.total_timeout_ms != 0 ? std::optional{std::chrono::milliseconds{desc.total_timeout_ms}} : std::nullopt, - .maxBodyBytes = - desc.max_body_bytes != 0 ? desc.max_body_bytes : DefaultResponseBodyBytes, + .maxBodyBytes = desc.max_body_bytes != 0 ? desc.max_body_bytes : DefaultResponseBodyBytes, }; request.headers.reserve(desc.header_count + 1); for (uint32_t i = 0; i < desc.header_count; ++i) { @@ -463,9 +460,7 @@ ModResult start_request(LoadedMod& mod, const HttpRequestDesc& desc, HttpComplet if (!immediate.has_value()) { return MOD_UNAVAILABLE; } - if (immediate->error == borealis::http::Error::NoBackend || - immediate->error == borealis::http::Error::NotInitialized) - { + if (immediate->error == borealis::http::Error::NoBackend) { return MOD_UNAVAILABLE; } task = borealis::detail::make_ready_task(std::move(*immediate)); @@ -550,7 +545,7 @@ void http_shutdown() { } bool http_available() { - return borealis::http::available() && borealis::http::initialize(); + return borealis::http::available(); } constexpr HttpService s_httpService{ diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index dcc6787f4b..11b15b0e0b 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -47,9 +47,9 @@ #include #include #include -#include #include #include +#include #include #include #include @@ -758,6 +758,7 @@ int game_main(int argc, char* argv[]) { // Run ImGui UI loop if Aurora couldn't initialize a backend if (auroraInfo.backend == BACKEND_NULL) { launchUILoop(); + borealis::shutdown(); borealis::sentry::shutdown(); borealis::log::shutdown(); fflush(stdout); @@ -770,10 +771,6 @@ int game_main(int argc, char* argv[]) { return 0; } - if (borealis::http::available() && !borealis::http::initialize()) { - DuskLog.warn("Failed to initialize the HTTP worker pool"); - } - if (dusk::getSettings().game.enableHighQualityMinimapTextures.getValue()) { dusk::hq_minimap::set_active(true); } @@ -890,7 +887,7 @@ int game_main(int argc, char* argv[]) { // pre game launch ui main loop if (!launchUILoop()) { - borealis::http::shutdown(); + borealis::shutdown(); borealis::sentry::shutdown(); borealis::log::shutdown(); fflush(stdout); @@ -981,7 +978,7 @@ int game_main(int argc, char* argv[]) { OSReport("Starting main01 (Game Loop)...\n"); main01(); - borealis::http::shutdown(); + borealis::shutdown(); // We need to cleanly shut down the threads to avoid crashes on shutdown. if (daMP_c::m_myObj) {