diff --git a/docker/dev-host/rivet-engine/config.jsonc b/docker/dev-host/rivet-engine/config.jsonc index de62c69aa5..c55ee2c15e 100644 --- a/docker/dev-host/rivet-engine/config.jsonc +++ b/docker/dev-host/rivet-engine/config.jsonc @@ -2,11 +2,6 @@ "guard": { "port": 6420 }, - "api_public": { - "lan_host": "127.0.0.1", - "host": "0.0.0.0", - "port": 6421 - }, "api_peer": { "host": "0.0.0.0", "port": 6422 diff --git a/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/0/config.jsonc b/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/0/config.jsonc index 7b59fba448..5be4e8e8da 100644 --- a/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/0/config.jsonc +++ b/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/0/config.jsonc @@ -2,11 +2,6 @@ "guard": { "port": 6420 }, - "api_public": { - "lan_host": "rivet-engine-dc-a-0", - "host": "0.0.0.0", - "port": 6421 - }, "api_peer": { "host": "0.0.0.0", "port": 6422 diff --git a/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/1/config.jsonc b/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/1/config.jsonc index 7b59fba448..5be4e8e8da 100644 --- a/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/1/config.jsonc +++ b/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/1/config.jsonc @@ -2,11 +2,6 @@ "guard": { "port": 6420 }, - "api_public": { - "lan_host": "rivet-engine-dc-a-0", - "host": "0.0.0.0", - "port": 6421 - }, "api_peer": { "host": "0.0.0.0", "port": 6422 diff --git a/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/2/config.jsonc b/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/2/config.jsonc index 7b59fba448..5be4e8e8da 100644 --- a/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/2/config.jsonc +++ b/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/2/config.jsonc @@ -2,11 +2,6 @@ "guard": { "port": 6420 }, - "api_public": { - "lan_host": "rivet-engine-dc-a-0", - "host": "0.0.0.0", - "port": 6421 - }, "api_peer": { "host": "0.0.0.0", "port": 6422 diff --git a/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/0/config.jsonc b/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/0/config.jsonc index aab7c3cd62..b6725f1155 100644 --- a/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/0/config.jsonc +++ b/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/0/config.jsonc @@ -2,11 +2,6 @@ "guard": { "port": 6420 }, - "api_public": { - "lan_host": "rivet-engine-dc-b-0", - "host": "0.0.0.0", - "port": 6421 - }, "api_peer": { "host": "0.0.0.0", "port": 6422 diff --git a/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/1/config.jsonc b/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/1/config.jsonc index aab7c3cd62..b6725f1155 100644 --- a/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/1/config.jsonc +++ b/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/1/config.jsonc @@ -2,11 +2,6 @@ "guard": { "port": 6420 }, - "api_public": { - "lan_host": "rivet-engine-dc-b-0", - "host": "0.0.0.0", - "port": 6421 - }, "api_peer": { "host": "0.0.0.0", "port": 6422 diff --git a/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/2/config.jsonc b/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/2/config.jsonc index aab7c3cd62..b6725f1155 100644 --- a/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/2/config.jsonc +++ b/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/2/config.jsonc @@ -2,11 +2,6 @@ "guard": { "port": 6420 }, - "api_public": { - "lan_host": "rivet-engine-dc-b-0", - "host": "0.0.0.0", - "port": 6421 - }, "api_peer": { "host": "0.0.0.0", "port": 6422 diff --git a/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/0/config.jsonc b/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/0/config.jsonc index 2555b0bdec..badd6d3f47 100644 --- a/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/0/config.jsonc +++ b/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/0/config.jsonc @@ -2,11 +2,6 @@ "guard": { "port": 6420 }, - "api_public": { - "lan_host": "rivet-engine-dc-c-0", - "host": "0.0.0.0", - "port": 6421 - }, "api_peer": { "host": "0.0.0.0", "port": 6422 diff --git a/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/1/config.jsonc b/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/1/config.jsonc index 2555b0bdec..badd6d3f47 100644 --- a/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/1/config.jsonc +++ b/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/1/config.jsonc @@ -2,11 +2,6 @@ "guard": { "port": 6420 }, - "api_public": { - "lan_host": "rivet-engine-dc-c-0", - "host": "0.0.0.0", - "port": 6421 - }, "api_peer": { "host": "0.0.0.0", "port": 6422 diff --git a/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/2/config.jsonc b/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/2/config.jsonc index 2555b0bdec..badd6d3f47 100644 --- a/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/2/config.jsonc +++ b/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/2/config.jsonc @@ -2,11 +2,6 @@ "guard": { "port": 6420 }, - "api_public": { - "lan_host": "rivet-engine-dc-c-0", - "host": "0.0.0.0", - "port": 6421 - }, "api_peer": { "host": "0.0.0.0", "port": 6422 diff --git a/docker/dev-multidc/datacenters/dc-a/rivet-engine/config.jsonc b/docker/dev-multidc/datacenters/dc-a/rivet-engine/config.jsonc index f3f2264c0a..a18d101b1e 100644 --- a/docker/dev-multidc/datacenters/dc-a/rivet-engine/config.jsonc +++ b/docker/dev-multidc/datacenters/dc-a/rivet-engine/config.jsonc @@ -2,11 +2,6 @@ "guard": { "port": 6420 }, - "api_public": { - "lan_host": "rivet-engine-dc-a", - "host": "0.0.0.0", - "port": 6421 - }, "api_peer": { "host": "0.0.0.0", "port": 6422 diff --git a/docker/dev-multidc/datacenters/dc-b/rivet-engine/config.jsonc b/docker/dev-multidc/datacenters/dc-b/rivet-engine/config.jsonc index d2365a8454..aec142af80 100644 --- a/docker/dev-multidc/datacenters/dc-b/rivet-engine/config.jsonc +++ b/docker/dev-multidc/datacenters/dc-b/rivet-engine/config.jsonc @@ -2,11 +2,6 @@ "guard": { "port": 6420 }, - "api_public": { - "lan_host": "rivet-engine-dc-b", - "host": "0.0.0.0", - "port": 6421 - }, "api_peer": { "host": "0.0.0.0", "port": 6422 diff --git a/docker/dev-multidc/datacenters/dc-c/rivet-engine/config.jsonc b/docker/dev-multidc/datacenters/dc-c/rivet-engine/config.jsonc index c936e0e0f0..c057b19253 100644 --- a/docker/dev-multidc/datacenters/dc-c/rivet-engine/config.jsonc +++ b/docker/dev-multidc/datacenters/dc-c/rivet-engine/config.jsonc @@ -2,11 +2,6 @@ "guard": { "port": 6420 }, - "api_public": { - "lan_host": "rivet-engine-dc-c", - "host": "0.0.0.0", - "port": 6421 - }, "api_peer": { "host": "0.0.0.0", "port": 6422 diff --git a/docker/dev-multinode/rivet-engine/0/config.jsonc b/docker/dev-multinode/rivet-engine/0/config.jsonc index a1d2990f85..33fbbb1271 100644 --- a/docker/dev-multinode/rivet-engine/0/config.jsonc +++ b/docker/dev-multinode/rivet-engine/0/config.jsonc @@ -2,11 +2,6 @@ "guard": { "port": 6420 }, - "api_public": { - "lan_host": "rivet-engine-0", - "host": "0.0.0.0", - "port": 6421 - }, "api_peer": { "host": "0.0.0.0", "port": 6422 diff --git a/docker/dev-multinode/rivet-engine/1/config.jsonc b/docker/dev-multinode/rivet-engine/1/config.jsonc index a1d2990f85..33fbbb1271 100644 --- a/docker/dev-multinode/rivet-engine/1/config.jsonc +++ b/docker/dev-multinode/rivet-engine/1/config.jsonc @@ -2,11 +2,6 @@ "guard": { "port": 6420 }, - "api_public": { - "lan_host": "rivet-engine-0", - "host": "0.0.0.0", - "port": 6421 - }, "api_peer": { "host": "0.0.0.0", "port": 6422 diff --git a/docker/dev-multinode/rivet-engine/2/config.jsonc b/docker/dev-multinode/rivet-engine/2/config.jsonc index a1d2990f85..33fbbb1271 100644 --- a/docker/dev-multinode/rivet-engine/2/config.jsonc +++ b/docker/dev-multinode/rivet-engine/2/config.jsonc @@ -2,11 +2,6 @@ "guard": { "port": 6420 }, - "api_public": { - "lan_host": "rivet-engine-0", - "host": "0.0.0.0", - "port": 6421 - }, "api_peer": { "host": "0.0.0.0", "port": 6422 diff --git a/docker/dev/rivet-engine/config.jsonc b/docker/dev/rivet-engine/config.jsonc index ba8f2b4dea..3e3b5c8064 100644 --- a/docker/dev/rivet-engine/config.jsonc +++ b/docker/dev/rivet-engine/config.jsonc @@ -2,11 +2,6 @@ "guard": { "port": 6420 }, - "api_public": { - "lan_host": "rivet-engine", - "host": "0.0.0.0", - "port": 6421 - }, "api_peer": { "host": "0.0.0.0", "port": 6422 diff --git a/docker/template/src/services/edge/rivet-engine.ts b/docker/template/src/services/edge/rivet-engine.ts index c730d428e7..08011ee09a 100644 --- a/docker/template/src/services/edge/rivet-engine.ts +++ b/docker/template/src/services/edge/rivet-engine.ts @@ -37,12 +37,6 @@ export function generateDatacenterRivetEngine( port: GUARD_PORT, // https is optional and not configured for local development }, - // api_public config - api_public: { - lan_host: serviceHost, - host: "0.0.0.0", - port: 6421, - }, // api_peer config api_peer: { host: "0.0.0.0", diff --git a/packages/core/pegboard-runner-ws/src/lib.rs b/packages/core/pegboard-runner-ws/src/lib.rs index 334c140ff0..88eb5bbc78 100644 --- a/packages/core/pegboard-runner-ws/src/lib.rs +++ b/packages/core/pegboard-runner-ws/src/lib.rs @@ -153,7 +153,7 @@ async fn handle_connection( let url_data = match parse_url(addr, uri) { Ok(x) => x, Err(err) => { - tracing::warn!(?addr, ?err, "parse url failed"); + tracing::warn!(?addr, ?err, "could not parse runner connection url"); let close_frame = err_to_close_frame(WsError::InvalidUrl(err.to_string()).build()); @@ -806,7 +806,7 @@ fn parse_url(addr: SocketAddr, uri: hyper::Uri) -> Result { .find_map(|(n, v)| (n == "protocol_version").then_some(v)) .context("missing `protocol_version` query parameter")? .parse::() - .context("invalid protocol version")?; + .context("invalid `protocol_version` query parameter")?; // Read namespace from query parameters let namespace = url