From d1d9d47b05e2904d78b9622789b7c685b20ecd52 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Fri, 16 Sep 2022 19:43:56 +0530 Subject: [PATCH] fix: respect `client.logging` option --- client-src/index.js | 2 +- client-src/utils/log.js | 3 ++- test/e2e/__snapshots__/logging.test.js.snap.webpack5 | 6 ------ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/client-src/index.js b/client-src/index.js index eb2b5fb8b3..0163311bd8 100644 --- a/client-src/index.js +++ b/client-src/index.js @@ -94,7 +94,7 @@ if (typeof parsedResourceQuery.reconnect !== "undefined") { options.reconnect = Number(parsedResourceQuery.reconnect); } -logEnabledFeatures(enabledFeatures); +logEnabledFeatures(enabledFeatures, options.logging); /** * @param {string} level diff --git a/client-src/utils/log.js b/client-src/utils/log.js index a62aee544b..29b62ccadb 100644 --- a/client-src/utils/log.js +++ b/client-src/utils/log.js @@ -18,7 +18,8 @@ setLogLevel(defaultLevel); const log = logger.getLogger(name); -const logEnabledFeatures = (features) => { +const logEnabledFeatures = (features, logLevel = "info") => { + setLogLevel(logLevel); const enabledFeatures = Object.keys(features); if (!features || enabledFeatures.length === 0) { return; diff --git a/test/e2e/__snapshots__/logging.test.js.snap.webpack5 b/test/e2e/__snapshots__/logging.test.js.snap.webpack5 index 7e6e26c1e0..59282da8b7 100644 --- a/test/e2e/__snapshots__/logging.test.js.snap.webpack5 +++ b/test/e2e/__snapshots__/logging.test.js.snap.webpack5 @@ -116,7 +116,6 @@ Array [ exports[`logging should work and log only error (sockjs) 1`] = ` Array [ - "[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.", "Hey.", "[webpack-dev-server] Errors while compiling. Reload prevented.", "[webpack-dev-server] ERROR @@ -126,7 +125,6 @@ Error from compilation", exports[`logging should work and log only error (ws) 1`] = ` Array [ - "[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.", "Hey.", "[webpack-dev-server] Errors while compiling. Reload prevented.", "[webpack-dev-server] ERROR @@ -160,7 +158,6 @@ Array [ exports[`logging should work and log warning and errors (sockjs) 1`] = ` Array [ - "[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.", "Hey.", "[webpack-dev-server] Warnings while compiling.", "[webpack-dev-server] WARNING @@ -173,7 +170,6 @@ Error from compilation", exports[`logging should work and log warning and errors (ws) 1`] = ` Array [ - "[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.", "Hey.", "[webpack-dev-server] Warnings while compiling.", "[webpack-dev-server] WARNING @@ -240,14 +236,12 @@ Array [ exports[`logging should work when the "client.logging" is "none" (sockjs) 1`] = ` Array [ - "[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.", "Hey.", ] `; exports[`logging should work when the "client.logging" is "none" (ws) 1`] = ` Array [ - "[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.", "Hey.", ] `;