Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-20 15:26:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(send): Don't retry send

Browse source 
Summary:
- There are some cases in which constantly retrying send can cause unexpected bugs like sending multiple times, so don't retry send at all
- Make 429 a permanent error code

Test Plan: Manual

Reviewers: jackie, evan

Reviewed By: jackie, evan

Differential Revision: https://phab.nylas.com/D3177
This commit is contained in:
Juan Tejada 2016-08-18 10:35:01 -07:00
parent 0a5388d0bb
commit 01dee59e04
5 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
spec/tasks/send-draft-task-spec.es6
View file

@ -377,15 +377,6 @@ describe('SendDraftTask', function sendDraftTask() {
}));
});
it("retries on timeouts", () => {
const thrownError = new APIError({statusCode: NylasAPI.TimeoutErrorCodes[0], body: "err"});
spyOn(NylasAPI, 'makeRequest').andReturn(Promise.reject(thrownError));
waitsForPromise(() => this.task.performRemote().then((status) => {
expect(status).toBe(Task.Status.Retry);
}));
});
describe("checking the promise chain halts on errors", () => {
beforeEach(() => {
spyOn(NylasEnv, 'reportError');

2
spec/tasks/syncback-model-task-spec.es6
View file

@ -168,7 +168,7 @@ describe('SyncbackModelTask', function syncbackModelTask() {
it("retries on retry-able API errors", () => {
jasmine.unspy(NylasAPI, "makeRequest");
const err = new APIError({statusCode: 429});
const err = new APIError({statusCode: 420});
spyOn(NylasAPI, "makeRequest").andReturn(Promise.reject(err))
performRemote((status) => {
expect(status).toBe(Task.Status.Retry)

2
src/flux/nylas-api.coffee
View file

@ -14,7 +14,7 @@ async = require 'async'
# A 0 code is when an error returns without a status code. These are
# things like "ESOCKETTIMEDOUT"
TimeoutErrorCodes = [0, "ETIMEDOUT", "ESOCKETTIMEDOUT", "ECONNRESET", "ENETDOWN", "ENETUNREACH"]
PermanentErrorCodes = [400, 401, 402, 403, 404, 405, 500, "ENOTFOUND", "ECONNREFUSED", "EHOSTDOWN", "EHOSTUNREACH"]
PermanentErrorCodes = [400, 401, 402, 403, 404, 405, 429, 500, "ENOTFOUND", "ECONNREFUSED", "EHOSTDOWN", "EHOSTUNREACH"]
CancelledErrorCode = [-123, "ECONNABORTED"]
SampleTemporaryErrorCode = 504

5
src/flux/tasks/multi-send-to-individual-task.es6
View file

@ -33,10 +33,7 @@ export default class MultiSendToIndividualTask extends Task {
// dozens of these tasks. The `MultieSendSessionCloseTask`
// accumulates and shows the errors.
if (err instanceof APIError) {
if (NylasAPI.PermanentErrorCodes.includes(err.statusCode)) {
return Promise.resolve([Task.Status.Failed, err]);
}
return Promise.resolve(Task.Status.Retry);
return Promise.resolve([Task.Status.Failed, err]);
}
return Promise.resolve([Task.Status.Failed, err]);
});

4
src/flux/tasks/send-draft-task.es6
View file

@ -239,10 +239,6 @@ export default class SendDraftTask extends BaseDraftTask {
let message = err.message;
if (err instanceof APIError) {
if (!NylasAPI.PermanentErrorCodes.includes(err.statusCode)) {
return Promise.resolve(Task.Status.Retry);
}
message = `Sorry, this message could not be sent. Please try again, and make sure your message is addressed correctly and is not too large.`;
if (err.statusCode === 402 && err.body.message) {
if (err.body.message.indexOf('at least one recipient') !== -1) {