GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-31 12:11:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

HTTP: changed retry strategy so the max period is ~4mins and limited to 16 retries

Browse Source
This commit is contained in:
Jan Bařtipán 2024-12-13 14:45:19 +01:00 committed by Lukas Matena
parent ebca3d29f2
commit b5c97738be
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/slic3r/GUI/WebViewPanel.cpp
View File

@ -752,7 +752,9 @@ wxString ConnectWebViewPanel::get_login_script(bool refresh)
let retry = false; let retry = false;
let backoff = 1000; let backoff = 1000;
const maxBackoff = 64000; const maxBackoff = 64000 * 4;
const maxRetries = 16;
let numRetries = 0;
do { do {
let error = false; let error = false;
@ -763,7 +765,8 @@ wxString ConnectWebViewPanel::get_login_script(bool refresh)
let body = await resp.text(); let body = await resp.text();
_prusaSlicer_log('Slicer Login resp ' + resp.status + ' (' + token.substring(token.length - 8) + ') body: ' + body); _prusaSlicer_log('Slicer Login resp ' + resp.status + ' (' + token.substring(token.length - 8) + ') body: ' + body);
if (resp.status >= 500 || resp.status == 408) { if (resp.status >= 500 || resp.status == 408) {
retry = true; numRetries++;
retry = maxRetries <= 0 || numRetries <= maxRetries;
} else { } else {
retry = false; retry = false;
if (resp.status >= 400) if (resp.status >= 400)
@ -772,6 +775,7 @@ wxString ConnectWebViewPanel::get_login_script(bool refresh)
} catch (e) { } catch (e) {
_prusaSlicer_log('Slicer Login failed: ' + e.toString()); _prusaSlicer_log('Slicer Login failed: ' + e.toString());
console.error('Slicer Login failed', e.toString()); console.error('Slicer Login failed', e.toString());
// intentionally not taking care about max retry count, as this is not server error but likely being offline
retry = true; retry = true;
} }

2
src/slic3r/Utils/Http.cpp
View File

@ -464,7 +464,7 @@ Http::Http(const std::string &url) : p(new priv(url)) {}
const HttpRetryOpt& HttpRetryOpt::default_retry() const HttpRetryOpt& HttpRetryOpt::default_retry()
{ {
using namespace std::chrono_literals; using namespace std::chrono_literals;
static HttpRetryOpt val = {500ms, 64s, 0}; static HttpRetryOpt val = {500ms, std::chrono::milliseconds(MAX_RETRY_DELAY_MS), MAX_RETRIES};
return val; return val;
} }

3
src/slic3r/Utils/Http.hpp
View File

@ -25,6 +25,9 @@ struct HttpRetryOpt
static const HttpRetryOpt& no_retry(); static const HttpRetryOpt& no_retry();
static const HttpRetryOpt& default_retry(); static const HttpRetryOpt& default_retry();
static constexpr size_t MAX_RETRY_DELAY_MS = 4 * 64000;
static constexpr size_t MAX_RETRIES = 16;
}; };