diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2023-05-30 11:34:50 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-30 15:34:50 +0000 |
commit | 3b69d238cdedc7f47515ba74f2366724679c5c7d (patch) | |
tree | 016643f2551b53270f7af35a69e457ba74f91173 /runtime/js | |
parent | acc6cdc0b1c0fae5e0fba3b0110f96119c2139f7 (diff) |
feat(runtime): add `WorkerLogLevel` (#19316)
This is not really used yet, but provides some infrastructure for doing
more fine grained logging in JS. I will add warn messages in a future
PR.
Diffstat (limited to 'runtime/js')
-rw-r--r-- | runtime/js/06_util.js | 19 | ||||
-rw-r--r-- | runtime/js/99_main.js | 12 |
2 files changed, 20 insertions, 11 deletions
diff --git a/runtime/js/06_util.js b/runtime/js/06_util.js index e04ae7bd7..971957b7e 100644 --- a/runtime/js/06_util.js +++ b/runtime/js/06_util.js @@ -5,18 +5,27 @@ const { Promise, SafeArrayIterator, } = primordials; -let logDebug = false; + +// WARNING: Keep this in sync with Rust (search for LogLevel) +const LogLevel = { + Error: 1, + Warn: 2, + Info: 3, + Debug: 4, +}; + +let logLevel = 3; let logSource = "JS"; -function setLogDebug(debug, source) { - logDebug = debug; +function setLogLevel(level, source) { + logLevel = level; if (source) { logSource = source; } } function log(...args) { - if (logDebug) { + if (logLevel >= LogLevel.Debug) { // if we destructure `console` off `globalThis` too early, we don't bind to // the right console, therefore we don't log anything out. globalThis.console.error( @@ -80,6 +89,6 @@ export { log, nonEnumerable, readOnly, - setLogDebug, + setLogLevel, writable, }; diff --git a/runtime/js/99_main.js b/runtime/js/99_main.js index 91d34272f..8fd9a6bd9 100644 --- a/runtime/js/99_main.js +++ b/runtime/js/99_main.js @@ -299,7 +299,7 @@ function runtimeStart( v8Version, tsVersion, target, - debugFlag, + logLevel, noColor, isTty, source, @@ -315,7 +315,7 @@ function runtimeStart( tsVersion, ); core.setBuildInfo(target); - util.setLogDebug(debugFlag, source); + util.setLogLevel(logLevel, source); setNoColor(noColor || !isTty); // deno-lint-ignore prefer-primordials Error.prepareStackTrace = core.prepareStackTrace; @@ -428,7 +428,7 @@ function bootstrapMainRuntime(runtimeOptions) { const { 0: args, 1: cpuCount, - 2: debugFlag, + 2: logLevel, 3: denoVersion, 4: locale, 5: location_, @@ -495,7 +495,7 @@ function bootstrapMainRuntime(runtimeOptions) { v8Version, tsVersion, target, - debugFlag, + logLevel, noColor, isTty, ); @@ -542,7 +542,7 @@ function bootstrapWorkerRuntime( const { 0: args, 1: cpuCount, - 2: debugFlag, + 2: logLevel, 3: denoVersion, 4: locale, 5: location_, @@ -610,7 +610,7 @@ function bootstrapWorkerRuntime( v8Version, tsVersion, target, - debugFlag, + logLevel, noColor, isTty, internalName ?? name, |