Skip to content

Commit 97583cd

Browse files
committed
Trace errors in drop
1 parent fafb0b1 commit 97583cd

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

src/connection.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use dap::base_message::Sendable;
1111
use dap::errors::ServerError;
1212
use dap::prelude::{Event, Request, ResponseBody, Server};
1313
use dap::server::{ServerReader, ServerWriter};
14+
use tracing::error;
1415

1516
pub struct Connection {
1617
inbound_rx: mpsc::Receiver<Request>,
@@ -107,7 +108,7 @@ fn spawn_reader_thread(
107108
thread::spawn(move || {
108109
while let Ok(Some(request)) = server_reader.poll_request() {
109110
if inbound_tx.send(request).is_err() {
110-
// TODO: Add error tracing
111+
error!("Inbound channel closed");
111112
break;
112113
}
113114
}

src/debugger.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use anyhow::{Result, bail};
22
use cairo_vm::vm::vm_core::VirtualMachine;
33
use dap::events::ExitedEventBody;
44
use dap::prelude::Event::{Exited, Terminated};
5-
use tracing::debug;
5+
use tracing::{debug, error};
66

77
use crate::connection::Connection;
88
use crate::debugger::handler::{HandleResult, NextAction};
@@ -64,9 +64,13 @@ impl CairoDebugger {
6464

6565
impl Drop for CairoDebugger {
6666
fn drop(&mut self) {
67-
// TODO: Add error tracing
68-
// TODO: Send correct exit code
69-
self.connection.send_event(Terminated(None)).ok();
70-
self.connection.send_event(Exited(ExitedEventBody { exit_code: 0 })).ok();
67+
if let Err(err) = self.connection.send_event(Terminated(None)) {
68+
error!("Sending terminated event failed: {}", err);
69+
}
70+
71+
// TODO(#34): Send correct exit code
72+
if let Err(err) = self.connection.send_event(Exited(ExitedEventBody { exit_code: 0 })) {
73+
error!("Sending exit event failed: {}", err);
74+
}
7175
}
7276
}

0 commit comments

Comments
 (0)