diff --git a/backend/.sqlx/query-d490fef418e8567fa40aad60e5d46f233ce478086430d8070fe7b2b8a4f9580e.json b/backend/.sqlx/query-5303cb9dd5903aa4791ef8e5e5881a50a832e65c8c9632e2e12cd9c2747f2fc7.json similarity index 85% rename from backend/.sqlx/query-d490fef418e8567fa40aad60e5d46f233ce478086430d8070fe7b2b8a4f9580e.json rename to backend/.sqlx/query-5303cb9dd5903aa4791ef8e5e5881a50a832e65c8c9632e2e12cd9c2747f2fc7.json index 07d30c5881f28..a95b00b8c8305 100644 --- a/backend/.sqlx/query-d490fef418e8567fa40aad60e5d46f233ce478086430d8070fe7b2b8a4f9580e.json +++ b/backend/.sqlx/query-5303cb9dd5903aa4791ef8e5e5881a50a832e65c8c9632e2e12cd9c2747f2fc7.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT *\n FROM websocket_trigger\n WHERE enabled IS TRUE AND (server_id IS NULL OR last_server_ping IS NULL OR last_server_ping < now() - interval '15 seconds')", + "query": "SELECT *\n FROM websocket_trigger\n WHERE enabled IS TRUE AND (server_id IS NULL OR last_server_ping IS NULL OR last_server_ping < now() - interval '15 seconds')", "describe": { "columns": [ { @@ -94,5 +94,5 @@ false ] }, - "hash": "d490fef418e8567fa40aad60e5d46f233ce478086430d8070fe7b2b8a4f9580e" + "hash": "5303cb9dd5903aa4791ef8e5e5881a50a832e65c8c9632e2e12cd9c2747f2fc7" } diff --git a/backend/windmill-api/src/lib.rs b/backend/windmill-api/src/lib.rs index e994ba9ba21ef..45a0ea71969a2 100644 --- a/backend/windmill-api/src/lib.rs +++ b/backend/windmill-api/src/lib.rs @@ -247,7 +247,8 @@ pub async fn run_server( }; if !*CLOUD_HOSTED { - websocket_triggers::start_websockets(db.clone(), rsmq).await; + let ws_killpill_rx = rx.resubscribe(); + websocket_triggers::start_websockets(db.clone(), rsmq, ws_killpill_rx).await; } // build our application with a route diff --git a/backend/windmill-api/src/websocket_triggers.rs b/backend/windmill-api/src/websocket_triggers.rs index 3bdd51c3e9cee..b94ed85461aeb 100644 --- a/backend/windmill-api/src/websocket_triggers.rs +++ b/backend/windmill-api/src/websocket_triggers.rs @@ -592,7 +592,7 @@ async fn listen_to_websocket( } else { tracing::error!("Websocket {} closed", url); if let None = - update_ping(db.clone(), &ws_trigger, Some("Websocket cloesd")).await + update_ping(db.clone(), &ws_trigger, Some("Websocket closed")).await { return; }