Skip to content

✨ handle debugee connection timeout #812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Don Jayamanne (DonJayamanne) merged 4 commits into from
Feb 17, 2018
Merged

✨ handle debugee connection timeout #812

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c145b3e
Version 0.7.0 of extension (#1381)
DonJayamanne Nov 9, 2017
93e0fa4
:fire: remove unwanted file
DonJayamanne Feb 16, 2018
e4467af
:sparkles: handle debugee connection timeout
DonJayamanne Feb 16, 2018
16c7ba6
:hammer: fixed code review comments
DonJayamanne Feb 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions src/client/debugger/mainV2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ import { BaseDebugServer } from './DebugServers/BaseDebugServer';
import { initializeIoc } from './serviceRegistry';
import { IDebugStreamProvider, IProtocolLogger, IProtocolMessageWriter, IProtocolParser } from './types';

const DEBUGGER_CONNECT_TIMEOUT = 10000;

export class PythonDebugger extends DebugSession {
public debugServer?: BaseDebugServer;
public debugClient?: DebugClient<{}>;
Expand Down Expand Up @@ -179,9 +181,8 @@ export class PythonDebugger extends DebugSession {
const enableLogging = args.logToFile === true;
this.emit('_py_enable_protocol_logging', enableLogging);

this.emit('_py_pre_launch');

this.startPTVSDDebugger(args)
.then(() => this.waitForDebuggerConnection())
.then(() => this.sendResponse(response))
.catch(ex => {
const message = this.getErrorUserFriendlyMessage(args, ex) || 'Debug Error';
Expand All @@ -194,6 +195,21 @@ export class PythonDebugger extends DebugSession {
const serverInfo = await this.debugServer!.Start();
return launcher.LaunchApplicationToDebug(serverInfo);
}
private async waitForDebuggerConnection() {
return new Promise<void>(async (resolve, reject) => {

@MikhailArkhipov Mikhail Arkhipov (MikhailArkhipov) Feb 16, 2018

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd make this configurable

@DonJayamanne Don Jayamanne (DonJayamanne) Feb 16, 2018

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

let rejected = false;
const timeout = setTimeout(() => {
rejected = true;
reject(new Error('Timeout waiting for debugger connection'));
}, DEBUGGER_CONNECT_TIMEOUT);

await this.debugServer!.client;

@MikhailArkhipov Mikhail Arkhipov (MikhailArkhipov) Feb 16, 2018

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this throws, do we need to unref still? Maybe finally ?

@DonJayamanne Don Jayamanne (DonJayamanne) Feb 16, 2018

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

timeout.unref();
if (!rejected) {
resolve();
}
});
}
private getErrorUserFriendlyMessage(launchArgs: LaunchRequestArguments, error: any): string | undefined {
if (!error) {
return;
Expand Down