fixup! Code cleanup

eclipse-che · Mar 19, 2020 · 61aa8ca · 61aa8ca
1 parent 0006084
commit 61aa8ca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@eclipse-che/workspace-client",
-  "version": "0.0.1",
+  "name": "@ivinokur/workspace-client",
+  "version": "0.0.9",
   "description": "",
   "main": "dist/server.js",
   "browser": "dist/client.js",

diff --git a/src/index.ts b/src/index.ts
@@ -25,6 +25,7 @@ export interface IRestAPIConfig {
     headers?: any;
     // path to self signed certificate
     ssCrtPath?: string;
+    loggingEnabled?: boolean;
 }
 
 export default class WorkspaceClient {
@@ -47,7 +48,7 @@ export default class WorkspaceClient {
 
     private static createAxiosInstance(config: IRestAPIConfig): AxiosInstance {
         if (!this.isItNode()) {
-            this.addLogInterceptorsIfEnabled(axios);
+            this.addLogInterceptorsIfEnabled(axios, config);
             return axios;
         }
 
@@ -79,7 +80,7 @@ export default class WorkspaceClient {
                     axiosRequestConfig.httpAgent = proxyIsHttps ? httpsOverHttpsAgent : httpOverHttpsAgent;
                 }
                 const axiosInstance = axios.create(axiosRequestConfig);
-                this.addLogInterceptorsIfEnabled(axiosInstance);
+                this.addLogInterceptorsIfEnabled(axiosInstance, config);
                 return axiosInstance;
             }
         }
@@ -89,19 +90,19 @@ export default class WorkspaceClient {
                     ca: certificateAuthority
                 })
             });
-            this.addLogInterceptorsIfEnabled(axiosInstance);
+            this.addLogInterceptorsIfEnabled(axiosInstance, config);
             return axiosInstance;
         }
-        this.addLogInterceptorsIfEnabled(axios);
+        this.addLogInterceptorsIfEnabled(axios,config);
         return axios;
     }
 
     private static isItNode() {
         return (typeof process !== 'undefined') && (typeof process.versions.node !== 'undefined');
     }
 
-    private static addLogInterceptorsIfEnabled(axiosInstance: AxiosInstance) {
-        if (!process.env.HTTP_REQUEST_LOG) {
+    private static addLogInterceptorsIfEnabled(axiosInstance: AxiosInstance, config: IRestAPIConfig) {
+        if (!config.loggingEnabled) {
             return;
         }
         axiosInstance.interceptors.request.use(request => {