Skip to content

Commit db7bd3d

Browse files
committed
Merge branch 'mert/create-logger-api/node-core' of https://github.com/mertcanaltin/node into mert/create-logger-api/node-core
2 parents 8ca2dc2 + 7474f35 commit db7bd3d

5 files changed

Lines changed: 11 additions & 1 deletion

File tree

lib/internal/bootstrap/realm.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,13 @@ const schemelessBlockList = new SafeSet([
128128
'sea',
129129
'sqlite',
130130
'quic',
131+
'logger',
131132
'test',
132133
'test/reporters',
133134
]);
134135
// Modules that will only be enabled at run time.
135-
const experimentalModuleList = new SafeSet(['ffi', 'sqlite', 'quic', 'stream/iter', 'zlib/iter']);
136+
137+
const experimentalModuleList = new SafeSet(['ffi', 'sqlite', 'quic', 'logger', 'stream/iter', 'zlib/iter']);
136138

137139
// Set up process.binding() and process._linkedBinding().
138140
{

lib/internal/process/pre_execution.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ function prepareExecution(options) {
116116
setupWarningHandler();
117117
setupFFI();
118118
setupSQLite();
119+
setupLogger();
119120
setupStreamIter();
120121
setupLogger();
121122
setupQuic();

src/node_options.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,10 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
606606
&EnvironmentOptions::experimental_sqlite,
607607
kAllowedInEnvvar,
608608
true);
609+
AddOption("--experimental-logger",
610+
"experimental node:logger module",
611+
&EnvironmentOptions::experimental_logger,
612+
kAllowedInEnvvar);
609613
AddOption("--experimental-stream-iter",
610614
"experimental iterable streams API (node:stream/iter)",
611615
&EnvironmentOptions::experimental_stream_iter,

src/node_options.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ class EnvironmentOptions : public Options {
128128
bool experimental_ffi = false;
129129
bool experimental_websocket = true;
130130
bool experimental_sqlite = true;
131+
bool experimental_logger = false;
131132
bool experimental_stream_iter = false;
132133
bool experimental_logger = false;
133134
bool webstorage = HAVE_SQLITE;

test/parallel/test-require-resolve.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ require(fixtures.path('resolve-paths', 'default', 'verify-paths.js'));
6262
builtinModules.forEach((mod) => {
6363
// TODO(@jasnell): Remove once node:quic is no longer flagged
6464
if (mod === 'node:quic') return;
65+
// node:logger requires --experimental-logger flag
66+
if (mod === 'node:logger') return;
6567
// TODO: Remove once node:ffi is no longer flagged
6668
if (mod === 'node:ffi') return;
6769
// node:logger requires --experimental-logger flag

0 commit comments

Comments
 (0)