Skip to content

Commit 0fbae53

Browse files
committed
fix naming changes in coordinator
1 parent ffabc2d commit 0fbae53

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

ui/Cargo.lock

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

ui/src/coordinator.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,7 @@ enum PlaygroundMessage {
440440
Response(WSResponse),
441441
StdoutPacket(String),
442442
StderrPacket(String),
443+
StreamFailure,
443444
}
444445

445446
#[derive(Debug, serde::Serialize, serde::Deserialize)]
@@ -460,14 +461,14 @@ impl From<(JobReport, serde_json::Value, ResponseKind)> for WSResponse {
460461
ResponseKind::Compile => {
461462
let mut success = false;
462463
let mut code = String::new();
463-
if let Some(Response::ReadFile(ReadFileResponse(Ok(data)))) = responses.last() {
464+
if let Some(ResponseResult(Ok(Response::ReadFile(ReadFileResponse(data))))) = responses.last() {
464465
success = true;
465466
code = std::str::from_utf8(data).unwrap().to_owned();
466467
}
467468
let mut stdout = String::new();
468469
let mut stderr = String::new();
469470
if responses.len() >= 3 {
470-
if let Some(Response::ExecuteCommand(ExecuteCommandResponse(Ok(output)))) =
471+
if let Some(ResponseResult(Ok(Response::ExecuteCommand(ExecuteCommandResponse(output))))) =
471472
responses.get(2)
472473
{
473474
stdout = from_utf8(&output.stdout).unwrap().to_owned();
@@ -485,14 +486,14 @@ impl From<(JobReport, serde_json::Value, ResponseKind)> for WSResponse {
485486
ResponseKind::Format => {
486487
let mut success = false;
487488
let mut code = String::new();
488-
if let Some(Response::ReadFile(ReadFileResponse(Ok(data)))) = responses.last() {
489+
if let Some(ResponseResult(Ok(Response::ReadFile(ReadFileResponse(data))))) = responses.last() {
489490
success = true;
490491
code = std::str::from_utf8(data).unwrap().to_owned();
491492
}
492493
let mut stdout = String::new();
493494
let mut stderr = String::new();
494495
if responses.len() >= 3 {
495-
if let Some(Response::ExecuteCommand(ExecuteCommandResponse(Ok(output)))) =
496+
if let Some(ResponseResult(Ok(Response::ExecuteCommand(ExecuteCommandResponse(output))))) =
496497
responses.get(2)
497498
{
498499
stdout = from_utf8(&output.stdout).unwrap().to_owned();
@@ -508,8 +509,8 @@ impl From<(JobReport, serde_json::Value, ResponseKind)> for WSResponse {
508509
})
509510
}
510511
ResponseKind::Execute => {
511-
let success = if let Some(Response::StreamCommand(resp)) = responses.last() {
512-
resp.0.is_ok()
512+
let success = if let Some(ResponseResult(resp)) = responses.last() {
513+
resp.is_ok()
513514
} else {
514515
false
515516
};
@@ -648,6 +649,9 @@ async fn pair_websocket_worker(
648649
WorkerMessage::StderrPacket(packet) => {
649650
ws_sender.send(serde_json::to_string(&PlaygroundMessage::StderrPacket(packet)).expect("Failed to serilaze standard output")).await.expect("Websocket failed to send standard output to client");
650651
}
652+
WorkerMessage::StreamFailure => {
653+
ws_sender.send(serde_json::to_string(&PlaygroundMessage::StreamFailure).expect("Failed to serilize streaming failure notification")).await.expect("Websocket failed to send streaming failure notification");
654+
}
651655
}
652656
}
653657
}

0 commit comments

Comments
 (0)