Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-02-25 08:35:16 +08:00
Code Issues Projects Releases Packages Wiki Activity

[iso-core] Increase the IMAP connection pool size

Browse source 
Summary:
Previously we limited it to 3. Gmail supports up to 15, many IMAP
servers support 10 by default. So let's bump it for those folks.

Test Plan: Run locally, verify things still work.

Reviewers: evan, spang, juan

Reviewed By: juan

Differential Revision: https://phab.nylas.com/D4175
This commit is contained in:
Mark Hahnenberg 2017-03-09 15:08:59 -08:00
parent 792994d95c
commit 512e4f75b5
2 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/isomorphic-core/src/env-helpers.es6
View file

@ -6,3 +6,10 @@ export function isClientEnv() {
export function isCloudEnv() { export function isCloudEnv() {
return !isClientEnv() return !isClientEnv()
} }
export function inDevMode() {
if (isClientEnv()) {
return window.NylasEnv.inDevMode();
}
return process.env.NODE_ENV !== 'production';
}

23
packages/isomorphic-core/src/imap-connection-pool.es6
View file

@ -1,8 +1,15 @@
const IMAPConnection = require('./imap-connection'); const IMAPConnection = require('./imap-connection');
const IMAPErrors = require('./imap-errors'); const IMAPErrors = require('./imap-errors');
const {ExponentialBackoffScheduler} = require('./backoff-schedulers'); const {ExponentialBackoffScheduler} = require('./backoff-schedulers');
const {inDevMode} = require('./env-helpers')
const MAX_IMAP_CONNECTIONS_PER_ACCOUNT = 3; const MAX_IMAP_CONNECTIONS_PER_ACCOUNT = 3;
const MAX_DEV_MODE_CONNECTIONS = 3
const MAX_GMAIL_CONNECTIONS = 7;
const MAX_O365_CONNECTIONS = 5;
const MAX_ICLOUD_CONNECTIONS = 5;
const MAX_IMAP_CONNECTIONS = 5;
const INITIAL_SOCKET_TIMEOUT_MS = 30 * 1000; // 30 sec const INITIAL_SOCKET_TIMEOUT_MS = 30 * 1000; // 30 sec
const MAX_SOCKET_TIMEOUT_MS = 10 * 60 * 1000 // 10 min const MAX_SOCKET_TIMEOUT_MS = 10 * 60 * 1000 // 10 min
@ -108,9 +115,23 @@ class IMAPConnectionPool {
this._poolMap = {}; this._poolMap = {};
} }
_maxConnectionsForAccount(account) {
if (inDevMode()) {
return MAX_DEV_MODE_CONNECTIONS;
}
switch (account.provider) {
case 'gmail': return MAX_GMAIL_CONNECTIONS;
case 'office365': return MAX_O365_CONNECTIONS;
case 'icloud': return MAX_ICLOUD_CONNECTIONS;
case 'imap': return MAX_IMAP_CONNECTIONS;
default: return MAX_DEV_MODE_CONNECTIONS;
}
}
async withConnectionsForAccount(account, {desiredCount, logger, onConnected, onTimeout}) { async withConnectionsForAccount(account, {desiredCount, logger, onConnected, onTimeout}) {
if (!this._poolMap[account.id]) { if (!this._poolMap[account.id]) {
this._poolMap[account.id] = new AccountConnectionPool(account, this._maxConnectionsPerAccount); this._poolMap[account.id] = new AccountConnectionPool(account, this._maxConnectionsForAccount(account));
} }
const pool = this._poolMap[account.id]; const pool = this._poolMap[account.id];