From 4a963ffbf5f27652519177486daf118b17b63ad6 Mon Sep 17 00:00:00 2001 From: Yury Shkoda Date: Wed, 22 Dec 2021 18:46:06 +0300 Subject: [PATCH] feat(polling-state): improve logging --- src/SessionManager.ts | 2 +- src/api/viya/spec/pollJobState.spec.ts | 7 +++++-- src/test/SessionManager.spec.ts | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/SessionManager.ts b/src/SessionManager.ts index a0c68d7..1f3ff5f 100644 --- a/src/SessionManager.ts +++ b/src/SessionManager.ts @@ -168,7 +168,7 @@ export class SessionManager { ) { if (stateLink) { if (this.debug && !this.printedSessionState.printed) { - logger.info('Polling session status...') + logger.info(`Polling: ${this.serverUrl + stateLink.href}`) this.printedSessionState.printed = true } diff --git a/src/api/viya/spec/pollJobState.spec.ts b/src/api/viya/spec/pollJobState.spec.ts index 664fb16..4cb45b4 100644 --- a/src/api/viya/spec/pollJobState.spec.ts +++ b/src/api/viya/spec/pollJobState.spec.ts @@ -9,7 +9,10 @@ import * as isNodeModule from '../../../utils/isNode' import { PollOptions } from '../../../types' import { WriteStream } from 'fs' +const baseUrl = 'http://localhost' const requestClient = new (>RequestClient)() +requestClient['httpClient'].defaults.baseURL = baseUrl + const defaultPollOptions: PollOptions = { maxPollCount: 100, pollInterval: 500, @@ -195,7 +198,7 @@ describe('pollJobState', () => { expect((process as any).logger.info).toHaveBeenCalledTimes(4) expect((process as any).logger.info).toHaveBeenNthCalledWith( 1, - 'Polling: /job/state' + `Polling: ${baseUrl}/job/state` ) expect((process as any).logger.info).toHaveBeenNthCalledWith( 2, @@ -203,7 +206,7 @@ describe('pollJobState', () => { ) expect((process as any).logger.info).toHaveBeenNthCalledWith( 3, - 'Polling: /job/state' + `Polling: ${baseUrl}/job/state` ) expect((process as any).logger.info).toHaveBeenNthCalledWith( 4, diff --git a/src/test/SessionManager.spec.ts b/src/test/SessionManager.spec.ts index d37305b..f40205a 100644 --- a/src/test/SessionManager.spec.ts +++ b/src/test/SessionManager.spec.ts @@ -89,7 +89,7 @@ describe('SessionManager', () => { expect((process as any).logger.info).toHaveBeenCalledTimes(3) expect((process as any).logger.info).toHaveBeenNthCalledWith( 1, - 'Polling session status...' + `Polling: ${process.env.SERVER_URL}` ) expect((process as any).logger.info).toHaveBeenNthCalledWith( 2,