mirror of
https://github.com/Microsoft/vscode
synced 2024-10-12 06:17:18 +00:00
up timeout to 5min (#156846)
This commit is contained in:
parent
cf43717e18
commit
13066d79e3
|
@ -243,7 +243,7 @@ export class GitHubServer implements IGitHubServer {
|
||||||
try {
|
try {
|
||||||
return await Promise.race([
|
return await Promise.race([
|
||||||
codeExchangePromise.promise,
|
codeExchangePromise.promise,
|
||||||
new Promise<string>((_, reject) => setTimeout(() => reject('Cancelled'), 60000)),
|
new Promise<string>((_, reject) => setTimeout(() => reject('Timed out'), 300_000)), // 5min timeout
|
||||||
promiseFromEvent<any, any>(token.onCancellationRequested, (_, __, reject) => { reject('User Cancelled'); }).promise
|
promiseFromEvent<any, any>(token.onCancellationRequested, (_, __, reject) => { reject('User Cancelled'); }).promise
|
||||||
]);
|
]);
|
||||||
} finally {
|
} finally {
|
||||||
|
@ -276,7 +276,7 @@ export class GitHubServer implements IGitHubServer {
|
||||||
vscode.env.openExternal(vscode.Uri.parse(`http://127.0.0.1:${port}/signin?nonce=${encodeURIComponent(server.nonce)}`));
|
vscode.env.openExternal(vscode.Uri.parse(`http://127.0.0.1:${port}/signin?nonce=${encodeURIComponent(server.nonce)}`));
|
||||||
const { code } = await Promise.race([
|
const { code } = await Promise.race([
|
||||||
server.waitForOAuthResponse(),
|
server.waitForOAuthResponse(),
|
||||||
new Promise<any>((_, reject) => setTimeout(() => reject('Cancelled'), 60000)),
|
new Promise<any>((_, reject) => setTimeout(() => reject('Timed out'), 300_000)), // 5min timeout
|
||||||
promiseFromEvent<any, any>(token.onCancellationRequested, (_, __, reject) => { reject('User Cancelled'); }).promise
|
promiseFromEvent<any, any>(token.onCancellationRequested, (_, __, reject) => { reject('User Cancelled'); }).promise
|
||||||
]);
|
]);
|
||||||
codeToExchange = code;
|
codeToExchange = code;
|
||||||
|
|
Loading…
Reference in a new issue