Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion ext/event_worker/events.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use std::convert::Infallible;

use base_mem_check::MemCheckState;
use enum_as_inner::EnumAsInner;
use serde::Deserialize;
Expand Down Expand Up @@ -50,14 +52,30 @@ pub struct LogEvent {
pub level: LogLevel,
}

#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
#[derive(Serialize, Deserialize, Debug, Default, PartialEq, Eq)]
#[repr(u8)]
pub enum LogLevel {
#[default]
Debug,
Info,
Warning,
Error,
}

impl TryFrom<u8> for LogLevel {
type Error = Infallible;

fn try_from(value: u8) -> Result<Self, Infallible> {
match value {
0 => Ok(Self::Debug),
1 => Ok(Self::Info),
2 => Ok(Self::Warning),
3 => Ok(Self::Error),
_ => Ok(Self::Debug),
}
}
}

#[derive(Serialize, Deserialize, Debug, EnumAsInner)]
pub enum WorkerEvents {
Boot(BootEvent),
Expand Down
7 changes: 2 additions & 5 deletions ext/event_worker/js_interceptors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,11 @@ use tokio::sync::mpsc;
fn op_user_worker_log(
state: &mut OpState,
#[string] msg: &str,
is_err: bool,
#[smi] level: i32,
) -> Result<(), AnyError> {
let maybe_tx =
state.try_borrow::<mpsc::UnboundedSender<WorkerEventWithMetadata>>();
let mut level = LogLevel::Info;
if is_err {
level = LogLevel::Error;
}
let level = LogLevel::try_from(level as u8).unwrap_or_default();

if let Some(tx) = maybe_tx {
let event_metadata = state
Expand Down
2 changes: 1 addition & 1 deletion ext/runtime/js/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ globalThis.bootstrapSBEdge = (opts, ctx) => {
ObjectDefineProperties(globalThis, {
console: nonEnumerable(
new console.Console((msg, level) => {
return ops.op_user_worker_log(msg, level > 1);
return ops.op_user_worker_log(msg, level);
}),
),
});
Expand Down