http: optimize debug function correctly

Exporting a variable that will be mutated later doesn't work. Refs: #37937 PR-URL: #37966 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
nodejs · Mar 31, 2021 · 3dee233 · 3dee233
1 parent 5c367e1
commit 3dee233
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/lib/_http_client.js b/lib/_http_client.js
@@ -46,7 +46,6 @@ const assert = require('internal/assert');
 const { once } = require('internal/util');
 const {
   _checkIsHttpToken: checkIsHttpToken,
-  debug,
   freeParser,
   parsers,
   HTTPParser,
@@ -78,6 +77,10 @@ const {
 
 const { addAbortSignal, finished } = require('stream');
 
+let debug = require('internal/util/debuglog').debuglog('http', (fn) => {
+  debug = fn;
+});
+
 const INVALID_PATH_REGEX = /[^\u0021-\u00ff]/;
 const kError = Symbol('kError');
 

diff --git a/lib/_http_common.js b/lib/_http_common.js
@@ -269,7 +269,6 @@ module.exports = {
   chunkExpression: /(?:^|\W)chunked(?:$|\W)/i,
   continueExpression: /(?:^|\W)100-continue(?:$|\W)/i,
   CRLF: '\r\n',
-  debug,
   freeParser,
   methods,
   parsers,

diff --git a/lib/_http_outgoing.js b/lib/_http_outgoing.js
@@ -79,8 +79,12 @@ const {
 const { validateString } = require('internal/validators');
 const { isUint8Array } = require('internal/util/types');
 
+let debug = require('internal/util/debuglog').debuglog('http', (fn) => {
+  debug = fn;
+});
+
 const HIGH_WATER_MARK = getDefaultHighWaterMark();
-const { CRLF, debug } = common;
+const { CRLF } = common;
 
 const kCorked = Symbol('corked');
 

diff --git a/lib/_http_server.js b/lib/_http_server.js
@@ -45,7 +45,6 @@ const assert = require('internal/assert');
 const {
   parsers,
   freeParser,
-  debug,
   CRLF,
   continueExpression,
   chunkExpression,
@@ -91,6 +90,10 @@ const {
 } = require('internal/dtrace');
 const { setTimeout, clearTimeout } = require('timers');
 
+let debug = require('internal/util/debuglog').debuglog('http', (fn) => {
+  debug = fn;
+});
+
 const dc = require('diagnostics_channel');
 const onRequestStartChannel = dc.channel('http.server.request.start');
 const onResponseFinishChannel = dc.channel('http.server.response.finish');