neurocyte/thespian
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: improve subprocess_windows read_error messages

Browse source
This commit is contained in:
CJ van den Berg 2024-06-27 18:54:42 +02:00
parent f1a89bdf9d
commit 5ba56ab5c7
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/subprocess_windows.zig
View file

@ -147,6 +147,7 @@ const Proc = struct {
errdefer self.deinit(); errdefer self.deinit();
var bytes: []u8 = ""; var bytes: []u8 = "";
var bytes_written: usize = 0; var bytes_written: usize = 0;
var stream_name: []u8 = "";
var err: i64 = 0; var err: i64 = 0;
var err_msg: []u8 = ""; var err_msg: []u8 = "";
if (try m.match(.{ "stream", "stdout", "read_complete", tp.extract(&bytes) })) { if (try m.match(.{ "stream", "stdout", "read_complete", tp.extract(&bytes) })) {
@ -187,8 +188,8 @@ const Proc = struct {
} else if (try m.match(.{"term"})) { } else if (try m.match(.{"term"})) {
const term_ = self.child.kill() catch |e| return tp.exit_error(e, @errorReturnTrace()); const term_ = self.child.kill() catch |e| return tp.exit_error(e, @errorReturnTrace());
return self.handle_term(term_); return self.handle_term(term_);
} else if (try m.match(.{ "stream", tp.any, "read_error", tp.extract(&err), tp.extract(&err_msg) })) { } else if (try m.match(.{ "stream", tp.extract(&stream_name), "read_error", tp.extract(&err), tp.extract(&err_msg) })) {
return tp.exit(err_msg); return tp.exit_fmt("{s} read_error: {s}", .{stream_name, err_msg});
} }
} }