Merge remote-tracking branch 'upstream/master' into MSNev/beta (#1880)

Update Retry logic to handle additional response codes (#1878)
This commit is contained in:
Nev 2022-08-15 14:29:43 -07:00 коммит произвёл GitHub
Родитель e0e7ef66d9 d6abf894d3
Коммит cc150e43fe
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 12 добавлений и 8 удалений

Просмотреть файл

@ -928,10 +928,14 @@ export class Sender extends BaseTelemetryPlugin implements IChannelControlsAI {
* @param statusCode * @param statusCode
*/ */
function _isRetriable(statusCode: number): boolean { function _isRetriable(statusCode: number): boolean {
return statusCode === 408 // Timeout return statusCode === 401 // Unauthorized
|| statusCode === 403 // Forbidden
|| statusCode === 408 // Timeout
|| statusCode === 429 // Too many requests. || statusCode === 429 // Too many requests.
|| statusCode === 500 // Internal server error. || statusCode === 500 // Internal server error.
|| statusCode === 503; // Service unavailable. || statusCode === 502 // Bad Gateway.
|| statusCode === 503 // Service unavailable.
|| statusCode === 504; // Gateway timeout.
} }
function _formatErrorMessageXhr(xhr: XMLHttpRequest, message?: string): string { function _formatErrorMessageXhr(xhr: XMLHttpRequest, message?: string): string {

12
common/config/rush/npm-shrinkwrap.json сгенерированный
Просмотреть файл

@ -2052,9 +2052,9 @@
"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
}, },
"node_modules/electron-to-chromium": { "node_modules/electron-to-chromium": {
"version": "1.4.212", "version": "1.4.213",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.212.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.213.tgz",
"integrity": "sha512-LjQUg1SpLj2GfyaPDVBUHdhmlDU1vDB4f0mJWSGkISoXQrn5/lH3ECPCuo2Bkvf6Y30wO+b69te+rZK/llZmjg==" "integrity": "sha512-+3DbGHGOCHTVB/Ms63bGqbyC1b8y7Fk86+7ltssB8NQrZtSCvZG6eooSl9U2Q0yw++fL2DpHKOdTU0NVEkFObg=="
}, },
"node_modules/emojis-list": { "node_modules/emojis-list": {
"version": "3.0.0", "version": "3.0.0",
@ -7060,9 +7060,9 @@
"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.4.212", "version": "1.4.213",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.212.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.213.tgz",
"integrity": "sha512-LjQUg1SpLj2GfyaPDVBUHdhmlDU1vDB4f0mJWSGkISoXQrn5/lH3ECPCuo2Bkvf6Y30wO+b69te+rZK/llZmjg==" "integrity": "sha512-+3DbGHGOCHTVB/Ms63bGqbyC1b8y7Fk86+7ltssB8NQrZtSCvZG6eooSl9U2Q0yw++fL2DpHKOdTU0NVEkFObg=="
}, },
"emojis-list": { "emojis-list": {
"version": "3.0.0", "version": "3.0.0",