mirror of
https://github.com/denoland/deno.git
synced 2025-01-11 08:33:43 -05:00
Fix silent error, add custom panic handler (#2098)
This is to work around Tokio's panic recovery feature. Ref https://github.com/tokio-rs/tokio/issues/495 Ref https://github.com/tokio-rs/tokio/issues/209 Ref https://github.com/denoland/deno/issues/1311 Fixes #2097
This commit is contained in:
parent
b413cd5afd
commit
c7e1f8fabd
3 changed files with 19 additions and 2 deletions
|
@ -111,6 +111,8 @@ fn lazy_start(parent_state: ThreadSafeState) -> ResourceId {
|
||||||
|
|
||||||
let mut runtime = C_RUNTIME.lock().unwrap();
|
let mut runtime = C_RUNTIME.lock().unwrap();
|
||||||
runtime.spawn(lazy(move || {
|
runtime.spawn(lazy(move || {
|
||||||
|
tokio_util::abort_on_panic();
|
||||||
|
|
||||||
worker.then(move |result| -> Result<(), ()> {
|
worker.then(move |result| -> Result<(), ()> {
|
||||||
// Close resource so the future created by
|
// Close resource so the future created by
|
||||||
// handle_worker_message_stream exits
|
// handle_worker_message_stream exits
|
||||||
|
|
|
@ -13,10 +13,22 @@ pub fn run<F>(future: F)
|
||||||
where
|
where
|
||||||
F: Future<Item = (), Error = ()> + Send + 'static,
|
F: Future<Item = (), Error = ()> + Send + 'static,
|
||||||
{
|
{
|
||||||
|
abort_on_panic();
|
||||||
// tokio::runtime::current_thread::run(future)
|
// tokio::runtime::current_thread::run(future)
|
||||||
tokio::run(future)
|
tokio::run(future)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Tokio swallows panics. In order to actually crash when we panic, we
|
||||||
|
// have to set this custom hook.
|
||||||
|
// https://github.com/tokio-rs/tokio/issues/495
|
||||||
|
// https://github.com/tokio-rs/tokio/issues/209
|
||||||
|
pub fn abort_on_panic() {
|
||||||
|
std::panic::set_hook(Box::new(|panic_info| {
|
||||||
|
eprintln!("{}", panic_info.to_string());
|
||||||
|
std::process::abort();
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
pub fn block_on<F, R, E>(future: F) -> Result<R, E>
|
pub fn block_on<F, R, E>(future: F) -> Result<R, E>
|
||||||
where
|
where
|
||||||
F: Send + 'static + Future<Item = R, Error = E>,
|
F: Send + 'static + Future<Item = R, Error = E>,
|
||||||
|
@ -40,7 +52,10 @@ where
|
||||||
let rt = tokio::runtime::Runtime::new().unwrap();
|
let rt = tokio::runtime::Runtime::new().unwrap();
|
||||||
let mut executor = rt.executor();
|
let mut executor = rt.executor();
|
||||||
let mut enter = tokio_executor::enter().expect("Multiple executors at once");
|
let mut enter = tokio_executor::enter().expect("Multiple executors at once");
|
||||||
tokio_executor::with_default(&mut executor, &mut enter, move |_enter| f());
|
tokio_executor::with_default(&mut executor, &mut enter, move |_enter| {
|
||||||
|
abort_on_panic();
|
||||||
|
f()
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
|
|
@ -324,7 +324,7 @@ mod tests {
|
||||||
onmessage = function(e) {
|
onmessage = function(e) {
|
||||||
console.log("msg from main script", e.data);
|
console.log("msg from main script", e.data);
|
||||||
if (e.data == "exit") {
|
if (e.data == "exit") {
|
||||||
close();
|
delete window.onmessage;
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
console.assert(e.data === "hi");
|
console.assert(e.data === "hi");
|
||||||
|
|
Loading…
Reference in a new issue