Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-25 01:41:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Re-enable pty host restarting

Browse Source
This commit is contained in:
Daniel Imms
2021-02-18 04:29:59 -08:00
parent 16510dfc86
commit a6cc65462a
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/platform/terminal/electron-browser/localPtyService.ts
+15 -15
View File
@@ -13,9 +13,9 @@ import { IProcessEnvironment } from 'vs/base/common/platform';
import { Emitter } from 'vs/base/common/event';
import { LogLevelChannelClient } from 'vs/platform/log/common/logIpc';
// enum Constants {
// MaxRestarts = 5
// }
enum Constants {
MaxRestarts = 5
}
export class LocalPtyService extends Disposable implements IPtyService {
declare readonly _serviceBrand: undefined;
@@ -23,8 +23,8 @@ export class LocalPtyService extends Disposable implements IPtyService {
// ProxyChannel is not used here because events get lost when forwarding across multiple proxies
private _proxy: IPtyService;
// private _restartCount = 0;
// private _isDisposed = false;
private _restartCount = 0;
private _isDisposed = false;
private readonly _onPtyHostExit = this._register(new Emitter<number>());
readonly onPtyHostExit = this._onPtyHostExit.event;
@@ -78,15 +78,15 @@ export class LocalPtyService extends Disposable implements IPtyService {
});
this._register(client.onDidProcessExit(e => {
this._onPtyHostExit.fire(e.code);
// if (!this._isDisposed) {
// if (this._restartCount <= Constants.MaxRestarts) {
// this._logService.error(`ptyHost terminated unexpectedly with code ${e.code}`);
// this._restartCount++;
// this._proxy = this._startPtyHost();
// } else {
// this._logService.error(`ptyHost terminated unexpectedly with code ${e.code}, giving up`);
// }
// }
if (!this._isDisposed) {
if (this._restartCount <= Constants.MaxRestarts) {
this._logService.error(`ptyHost terminated unexpectedly with code ${e.code}`);
this._restartCount++;
this._proxy = this._startPtyHost();
} else {
this._logService.error(`ptyHost terminated unexpectedly with code ${e.code}, giving up`);
}
}
}));
// Setup logging
@@ -107,7 +107,7 @@ export class LocalPtyService extends Disposable implements IPtyService {
}
dispose() {
// this._isDisposed = true;
this._isDisposed = true;
super.dispose();
}