From 3b69d238cdedc7f47515ba74f2366724679c5c7d Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Tue, 30 May 2023 11:34:50 -0400
Subject: 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.
---
 cli/factory.rs        | 6 +-----
 cli/standalone/mod.rs | 3 ++-
 cli/worker.rs         | 7 ++++---
 3 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'cli')

diff --git a/cli/factory.rs b/cli/factory.rs
index 8e20e5514..17d141be1 100644
--- a/cli/factory.rs
+++ b/cli/factory.rs
@@ -678,11 +678,7 @@ impl CliFactory {
   ) -> Result<CliMainWorkerOptions, AnyError> {
     Ok(CliMainWorkerOptions {
       argv: self.options.argv().clone(),
-      debug: self
-        .options
-        .log_level()
-        .map(|l| l == log::Level::Debug)
-        .unwrap_or(false),
+      log_level: self.options.log_level().unwrap_or(log::Level::Info).into(),
       coverage_dir: self.options.coverage_dir(),
       enable_testing_features: self.options.enable_testing_features(),
       has_node_modules_dir: self.options.has_node_modules_dir(),
diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs
index c7f595e17..1ecb48cd7 100644
--- a/cli/standalone/mod.rs
+++ b/cli/standalone/mod.rs
@@ -46,6 +46,7 @@ use deno_runtime::deno_tls::RootCertStoreProvider;
 use deno_runtime::deno_web::BlobStore;
 use deno_runtime::permissions::Permissions;
 use deno_runtime::permissions::PermissionsContainer;
+use deno_runtime::WorkerLogLevel;
 use deno_semver::npm::NpmPackageReqReference;
 use import_map::parse_from_json;
 use std::pin::Pin;
@@ -423,7 +424,7 @@ pub async fn run(
     None,
     CliMainWorkerOptions {
       argv: metadata.argv,
-      debug: false,
+      log_level: WorkerLogLevel::Info,
       coverage_dir: None,
       enable_testing_features: false,
       has_node_modules_dir,
diff --git a/cli/worker.rs b/cli/worker.rs
index 4a41da1a5..6edf427ea 100644
--- a/cli/worker.rs
+++ b/cli/worker.rs
@@ -37,6 +37,7 @@ use deno_runtime::web_worker::WebWorkerOptions;
 use deno_runtime::worker::MainWorker;
 use deno_runtime::worker::WorkerOptions;
 use deno_runtime::BootstrapOptions;
+use deno_runtime::WorkerLogLevel;
 use deno_semver::npm::NpmPackageReqReference;
 
 use crate::args::StorageKeyResolver;
@@ -73,7 +74,7 @@ pub trait HasNodeSpecifierChecker: Send + Sync {
 #[derive(Clone)]
 pub struct CliMainWorkerOptions {
   pub argv: Vec<String>,
-  pub debug: bool,
+  pub log_level: WorkerLogLevel,
   pub coverage_dir: Option<String>,
   pub enable_testing_features: bool,
   pub has_node_modules_dir: bool,
@@ -434,7 +435,7 @@ impl CliMainWorkerFactory {
         cpu_count: std::thread::available_parallelism()
           .map(|p| p.get())
           .unwrap_or(1),
-        debug_flag: shared.options.debug,
+        log_level: shared.options.log_level,
         enable_testing_features: shared.options.enable_testing_features,
         locale: deno_core::v8::icu::get_language_tag(),
         location: shared.options.location.clone(),
@@ -562,7 +563,7 @@ fn create_web_worker_callback(
         cpu_count: std::thread::available_parallelism()
           .map(|p| p.get())
           .unwrap_or(1),
-        debug_flag: shared.options.debug,
+        log_level: shared.options.log_level,
         enable_testing_features: shared.options.enable_testing_features,
         locale: deno_core::v8::icu::get_language_tag(),
         location: Some(args.main_module.clone()),
-- 
cgit v1.2.3