diff options
Diffstat (limited to 'src/server/DashSession')
| -rw-r--r-- | src/server/DashSession/DashSessionAgent.ts | 2 | ||||
| -rw-r--r-- | src/server/DashSession/Session/agents/promisified_ipc_manager.ts | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/server/DashSession/DashSessionAgent.ts b/src/server/DashSession/DashSessionAgent.ts index f937c17ad..891316b80 100644 --- a/src/server/DashSession/DashSessionAgent.ts +++ b/src/server/DashSession/DashSessionAgent.ts @@ -35,7 +35,7 @@ export class DashSessionAgent extends AppliedSessionAgent { monitor.addReplCommand('pull', [], () => monitor.exec('git pull')); monitor.addReplCommand('solr', [/start|stop|index/], this.executeSolrCommand); monitor.addReplCommand('backup', [], this.backup); - monitor.addReplCommand('debug', [/\S+\@\S+/], async ([to]) => this.dispatchZippedDebugBackup(to)); + monitor.addReplCommand('debug', [/\S+@\S+/], async ([to]) => this.dispatchZippedDebugBackup(to)); monitor.on('backup', this.backup); monitor.on('debug', async ({ to }) => this.dispatchZippedDebugBackup(to)); monitor.on('delete', WebSocket.doDelete); diff --git a/src/server/DashSession/Session/agents/promisified_ipc_manager.ts b/src/server/DashSession/Session/agents/promisified_ipc_manager.ts index 99b4d4de3..fc870d003 100644 --- a/src/server/DashSession/Session/agents/promisified_ipc_manager.ts +++ b/src/server/DashSession/Session/agents/promisified_ipc_manager.ts @@ -88,10 +88,10 @@ export class PromisifiedIPCManager { return new Promise<Response<T>>(resolve => { const messageId = Utilities.guid(); type InternalMessageHandler = (message: any /* MessageListener */) => any | Promise<any>; - const responseHandler: InternalMessageHandler = ({ metadata: { id, isResponse }, args }) => { + const responseHandler: InternalMessageHandler = ({ metadata: { id, isResponse }, args: hargs }) => { if (isResponse && id === messageId) { this.target.removeListener('message', responseHandler); - resolve(args); + resolve(hargs); } }; this.target.addListener('message', responseHandler); @@ -111,6 +111,7 @@ export class PromisifiedIPCManager { * promises in the caller to resolve. */ public destroy = () => + // eslint-disable-next-line no-async-promise-executor new Promise<void>(async resolve => { if (this.callerIsTarget) { this.destroyHelper(); |