refactor: simplify logger assignment in proxy

Author: bjohansebas

lib/Server.js

@@ -1391,36 +1391,8 @@ class Server {
           return item;
         }
 
-        /**
-         * @param {"info" | "warn" | "error" | "debug" | "silent" | undefined | "none" | "log" | "verbose"} level level
-         * @returns {"info" | "warn" | "error" | "debug" | "silent" | undefined} log level for proxy
-         */
-        const getLogLevelForProxy = (level) => {
-          if (level === "none") {
-            return "silent";
-          }
-
-          if (level === "log") {
-            return "info";
-          }
-
-          if (level === "verbose") {
-            return "debug";
-          }
-
-          return level;
-        };
-
-        if (typeof item.logger === "undefined") {
-          item.logger = getLogLevelForProxy(
-            compilerOptions.infrastructureLogging
-              ? compilerOptions.infrastructureLogging.level
-              : "info",
-          );
-        }
-
         if (typeof item.logger === "undefined") {
-          item.logger = () => this.logger;
+          item.logger = this.logger;
         }
 
         return item;

test/server/proxy-option.test.js

@@ -557,7 +557,7 @@ describe("proxy option", () => {
 
       const proxy = express();
 
-      proxy.get("*", (proxyReq, res) => {
+      proxy.get("*slug", (proxyReq, res) => {
         res.send("from proxy");
       });
 
@@ -692,7 +692,7 @@ describe("proxy option", () => {
 
       // This forces Express to try to decode URLs, which is needed for the test
       // associated with the middleware below.
-      proxy.all("*", (_req, res, next) => {
+      proxy.all("*slug", (_req, res, next) => {
         next();
       });
       // We must define all 4 params in order for this to be detected as an
@@ -831,7 +831,7 @@ describe("proxy option", () => {
     });
   });
 
-  describe("should work and respect `logProvider` and `logLevel` options", () => {
+  describe("should work and respect `logger` option", () => {
     let server;
     let req;
     let customLogProvider;
@@ -853,8 +853,7 @@ describe("proxy option", () => {
             {
               context: "/my-path",
               target: "http://unknown:1234",
-              logProvider: () => customLogProvider,
-              logLevel: "error",
+              logger: customLogProvider,
             },
           ],
           port: port3,
@@ -878,59 +877,7 @@ describe("proxy option", () => {
       it("respects a proxy option when a request path is matched", async () => {
         await req.get("/my-path");
 
-        expect(customLogProvider.error).toHaveBeenCalledTimes(1);
-      });
-    });
-  });
-
-  describe("should work and respect the `logLevel` option with `silent` value", () => {
-    let server;
-    let req;
-    let customLogProvider;
-
-    beforeAll(async () => {
-      customLogProvider = {
-        log: jest.fn(),
-        debug: jest.fn(),
-        info: jest.fn(),
-        warn: jest.fn(),
-        error: jest.fn(),
-      };
-
-      const compiler = webpack([config, config]);
-
-      server = new Server(
-        {
-          proxy: [
-            {
-              context: "my-path",
-              target: "http://unknown:1234",
-              logProvider: () => customLogProvider,
-              logLevel: "silent",
-            },
-          ],
-          port: port3,
-        },
-        compiler,
-      );
-
-      await server.start();
-
-      await listenProxyServers();
-
-      req = request(server.app);
-    });
-
-    afterAll(async () => {
-      await server.stop();
-      await closeProxyServers();
-    });
-
-    describe("target", () => {
-      it("respects a proxy option when a request path is matched", async () => {
-        await req.get("/my-path");
-
-        expect(customLogProvider.error).toHaveBeenCalledTimes(0);
+        expect(customLogProvider.info).toHaveBeenCalledTimes(1);
       });
     });
   });
@@ -960,7 +907,7 @@ describe("proxy option", () => {
             {
               context: "/my-path",
               target: "http://unknown:1234",
-              logProvider: () => customLogProvider,
+              logger: customLogProvider,
             },
           ],
           port: port3,
@@ -1014,7 +961,7 @@ describe("proxy option", () => {
             {
               context: "/my-path",
               target: "http://unknown:1234",
-              logProvider: () => customLogProvider,
+              logger: customLogProvider,
             },
           ],
           port: port3,