OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Wrap shared process in retry

Browse Source
This commit is contained in:
Asher
2019-02-06 18:11:31 -06:00
parent 5d02194048
commit 499798fc17
5 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/ide/src/fill/notification.ts
View File

@ -41,20 +41,30 @@ export interface IProgressService {
}
/**
* Temporary notification service.
* Console-based notification service.
*/
export class NotificationService implements INotificationService {
public error(error: Error): void {
logger.error(error.message, field("error", error));
}
public prompt(_severity: Severity, message: string, _buttons: INotificationButton[], _onCancel: () => void): INotificationHandle {
throw new Error(`cannot prompt using the console: ${message}`);
public prompt(severity: Severity, message: string, _buttons: INotificationButton[], _onCancel: () => void): INotificationHandle {
switch (severity) {
case Severity.Info: logger.info(message); break;
case Severity.Warning: logger.warn(message); break;
case Severity.Error: logger.error(message); break;
}
return {
close: (): void => undefined,
updateMessage: (): void => undefined,
updateButtons: (): void => undefined,
};
}
}
/**
* Temporary progress service.
* Console-based progress service.
*/
export class ProgressService implements IProgressService {
public start<T>(title: string, task: (progress: IProgress) => Promise<T>): Promise<T> {

16
packages/ide/src/retry.ts
View File

@ -1,4 +1,4 @@
import { logger } from "@coder/logger";
import { logger, field } from "@coder/logger";
import { NotificationService, INotificationHandle, INotificationService, Severity } from "./fill/notification";
interface IRetryItem {
@ -105,7 +105,7 @@ export class Retry {
/**
* Retry a service.
*/
public run(name: string): void {
public run(name: string, error?: Error): void {
if (!this.items.has(name)) {
throw new Error(`"${name}" is not registered`);
}
@ -117,7 +117,7 @@ export class Retry {
item.running = true;
// This timeout is for the case when the connection drops; this allows time
// for the Wush service to come in and block everything because some other
// for the socket service to come in and block everything because some other
// services might make it here first and try to restart, which will fail.
setTimeout(() => {
if (this.blocked && this.blocked !== name) {
@ -125,7 +125,7 @@ export class Retry {
}
if (!item.count || item.count < this.maxImmediateRetries) {
return this.runItem(name, item);
return this.runItem(name, item, error);
}
if (!item.delay) {
@ -137,10 +137,10 @@ export class Retry {
}
}
logger.info(`Retrying ${name.toLowerCase()} in ${item.delay}s`);
logger.info(`Retrying ${name.toLowerCase()} in ${item.delay}s`, error && field("error", error.message));
const itemDelayMs = item.delay * 1000;
item.end = Date.now() + itemDelayMs;
item.timeout = setTimeout(() => this.runItem(name, item), itemDelayMs);
item.timeout = setTimeout(() => this.runItem(name, item, error), itemDelayMs);
this.updateNotification();
}, this.waitDelay);
@ -165,7 +165,7 @@ export class Retry {
/**
* Run an item.
*/
private runItem(name: string, item: IRetryItem): void {
private runItem(name: string, item: IRetryItem, error?: Error): void {
if (!item.count) {
item.count = 1;
} else {
@ -175,7 +175,7 @@ export class Retry {
const retryCountText = item.count <= this.maxImmediateRetries
? `[${item.count}/${this.maxImmediateRetries}]`
: `[${item.count}]`;
logger.info(`Trying ${name.toLowerCase()} ${retryCountText}...`);
logger.info(`Starting ${name.toLowerCase()} ${retryCountText}...`, error && field("error", error.message));
const endItem = (): void => {
this.stopItem(item);