Skip to content

Commit 902b5ec

Browse files
committed
fix: use correct vbare functions for runner tunnel
1 parent e7e4a9e commit 902b5ec

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

engine/packages/epoxy/src/http_client.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,14 @@ pub async fn send_message_to_address(
135135
let client = rivet_pools::reqwest::client().await?;
136136

137137
// Create the request
138-
let request = versioned::Request::wrap_latest(request);
138+
let request = versioned::Request::wrap_latest(request)
139+
.serialize()
140+
.context("failed to serialize epoxy request")?;
139141

140142
// Send the request
141143
let response_result = client
142144
.post(replica_url.to_string())
143-
.body(request.serialize()?)
145+
.body(request)
144146
.send()
145147
.custom_instrument(tracing::info_span!("http_request"))
146148
.await;

engine/packages/epoxy/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ pub fn registry() -> WorkflowResult<Registry> {
1919
let mut registry = Registry::new();
2020
registry.register_workflow::<coordinator::Workflow>()?;
2121
registry.register_workflow::<replica::Workflow>()?;
22+
registry.register_workflow::<purger::Workflow>()?;
2223

2324
Ok(registry)
2425
}

engine/packages/pegboard-runner/src/client_to_pubsub_task.rs

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,17 @@ pub async fn task(
3333
);
3434

3535
// Parse message
36-
let msg =
37-
match versioned::ToServer::deserialize_version(&data, conn.protocol_version)
38-
.and_then(|x| x.unwrap_latest())
39-
{
40-
Ok(x) => x,
41-
Err(err) => {
42-
tracing::warn!(
43-
?err,
44-
data_len = data.len(),
45-
"failed to deserialize message"
46-
);
47-
continue;
48-
}
49-
};
36+
let msg = match versioned::ToServer::deserialize(&data, conn.protocol_version) {
37+
Ok(x) => x,
38+
Err(err) => {
39+
tracing::warn!(
40+
?err,
41+
data_len = data.len(),
42+
"failed to deserialize message"
43+
);
44+
continue;
45+
}
46+
};
5047

5148
handle_message(&ctx, &conn, msg)
5249
.await

engine/packages/pegboard-runner/src/pubsub_to_client_task.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ pub async fn task(conn: Arc<Conn>, mut sub: Subscriber) -> Result<()> {
9292

9393
// Forward raw message to WebSocket
9494
let serialized_msg =
95-
match versioned::ToClient::wrap_latest(msg).serialize_version(conn.protocol_version) {
95+
match versioned::ToClient::wrap_latest(msg).serialize(conn.protocol_version) {
9696
Result::Ok(x) => x,
9797
Err(err) => {
9898
tracing::error!(?err, "failed to serialize tunnel message");

0 commit comments

Comments
 (0)