Skip to content

Commit 2fbae0c

Browse files
committed
chore: Refactor printlns to logs
1 parent c931f7a commit 2fbae0c

File tree

13 files changed

+23
-19
lines changed

13 files changed

+23
-19
lines changed

Cargo.lock

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/base/src/rt_worker/implementation/default_handler.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use tokio::sync::oneshot::Receiver;
99

1010
impl WorkerHandler for Worker {
1111
fn handle_error(&self, error: Error) -> Result<WorkerEvents, Error> {
12-
println!("{}", error);
12+
log::error!("{}", error);
1313
Ok(WorkerEvents::BootFailure(BootFailureEvent {
1414
msg: error.to_string(),
1515
}))

crates/base/tests/user_worker_tests.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,8 @@ async fn test_user_imports_npm() {
7171

7272
let body_bytes = hyper::body::to_bytes(res.into_body()).await.unwrap();
7373

74-
assert_eq!(body_bytes, r#"{"is_even":true}"#);
74+
assert_eq!(
75+
body_bytes,
76+
r#"{"is_even":true,"hello":"","numbers":{"Uno":1,"Dos":2}}"#
77+
);
7578
}

crates/cpu_timer/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ impl CPUTimer {
7777

7878
#[cfg(not(target_os = "linux"))]
7979
pub fn start(_: u64, _: u64, _: CPUAlarmVal) -> Result<Self, Error> {
80-
println!("CPU timer: not enabled (need Linux)");
80+
log::error!("CPU timer: not enabled (need Linux)");
8181
Ok(Self {})
8282
}
8383
}

crates/node/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,4 @@ winapi = "=0.3.9"
7070
# https://github.com/dalek-cryptography/x25519-dalek/pull/89
7171
x25519-dalek = "2.0.0-pre.1"
7272
x509-parser = "0.15.0"
73+
log.workspace = true

crates/node/global.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,13 +248,13 @@ fn is_managed_key(scope: &mut v8::HandleScope, key: v8::Local<v8::Name>) -> bool
248248

249249
fn current_mode(scope: &mut v8::HandleScope) -> Mode {
250250
let Some(v8_string) = v8::StackTrace::current_script_name_or_source_url(scope) else {
251-
println!("current_script_name_or_source_url, Using Deno");
251+
log::debug!("current_script_name_or_source_url, Using SB");
252252
return Mode::Deno;
253253
};
254254
let op_state = deno_core::JsRuntime::op_state_from(scope);
255255
let op_state = op_state.borrow();
256256
let Some(node_resolver) = op_state.try_borrow::<Rc<NodeResolver>>() else {
257-
println!("Node resolver not available, using Deno");
257+
log::debug!("Node resolver not available, using SB");
258258
return Mode::Deno;
259259
};
260260
let mut buffer = [MaybeUninit::uninit(); 2048];

crates/node/ops/http2.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,6 @@ pub async fn op_http2_client_get_response_body_chunk(
493493
return Ok((Some(data.to_vec()), false));
494494
}
495495
DataOrTrailers::Trailers(trailers) => {
496-
println!("{trailers:?}");
497496
if let Some(trailers_tx) = RcRef::map(&resource, |r| &r.trailers_tx)
498497
.borrow_mut()
499498
.await

crates/npm/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@ percent-encoding = "=2.3.0"
3030
hex = "0.4"
3131
base64.workspace = true
3232
bincode = "=1.3.3"
33-
thiserror.workspace = true
33+
thiserror.workspace = true
34+
log.workspace = true

crates/npm/installer.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use deno_core::futures::StreamExt;
1010
use deno_npm::registry::NpmRegistryApi;
1111
use deno_npm::registry::NpmRegistryPackageInfoLoadError;
1212
use deno_semver::package::PackageReq;
13+
use log::debug;
1314
use sb_core::util::sync::AtomicFlag;
1415

1516
use super::CliNpmRegistryApi;
@@ -91,7 +92,7 @@ impl PackageJsonDepsInstaller {
9192
.resolve_pkg_id_from_pkg_req(req)
9293
.is_ok()
9394
}) {
94-
println!("All package.json deps resolvable. Skipping top level install.");
95+
debug!("All package.json deps resolvable. Skipping top level install.");
9596
return Ok(()); // everything is already resolvable
9697
}
9798

@@ -104,7 +105,7 @@ impl PackageJsonDepsInstaller {
104105
.resolve_package_req_as_pending_with_info(req, &info);
105106
if let Err(err) = result {
106107
if inner.npm_registry_api.mark_force_reload() {
107-
println!("Failed to resolve package. Retrying. Error: {err:#}");
108+
debug!("Failed to resolve package. Retrying. Error: {err:#}");
108109
// re-initialize
109110
reqs_with_info_futures = inner.reqs_with_info_futures(&package_reqs);
110111
} else {

crates/npm/registry.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ use deno_core::url::Url;
2121
use deno_npm::registry::NpmPackageInfo;
2222
use deno_npm::registry::NpmRegistryApi;
2323
use deno_npm::registry::NpmRegistryPackageInfoLoadError;
24+
use log::debug;
2425
use once_cell::sync::Lazy;
2526
use sb_core::cache::CacheSetting;
2627
use sb_core::cache::CACHE_PERM;
@@ -288,7 +289,7 @@ impl CliNpmRegistryApiInner {
288289
&self,
289290
name: &str,
290291
) -> Result<Option<NpmPackageInfo>, AnyError> {
291-
println!("Downloading load_package_info_from_registry_inner");
292+
debug!("Downloading load_package_info_from_registry_inner");
292293
if *self.cache.cache_setting() == CacheSetting::Only {
293294
return Err(custom_error(
294295
"NotCached",

0 commit comments

Comments
 (0)