fix ws killpill (#4551)

* websocket killpill

* oups

* nit

---------

Co-authored-by: Ruben Fiszel <ruben@windmill.dev>
This commit is contained in:
HugoCasa
2024-10-19 01:17:15 +02:00
committed by GitHub
parent fc7bbb9168
commit 17d9541dc2
3 changed files with 5 additions and 4 deletions

View File

@@ -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"
}

View File

@@ -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

View File

@@ -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;
}