fix statement_timeout bug

prostgles · Oct 15, 2023 · ef8a4c0 · ef8a4c0
1 parent 8b327b0
commit ef8a4c0
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/lib/PubSubManager/initPubSubManager.ts b/lib/PubSubManager/initPubSubManager.ts
@@ -65,7 +65,6 @@ export async function initPubSubManager(this: PubSubManager): Promise<PubSubMana
             checkForStaleTriggers = `                          
               DO $$
               BEGIN
-                set statement_timeout to ${Math.min(5e3, Math.round(this.appCheckFrequencyMS/2))};
                 /* 
                   ${REALTIME_TRIGGER_CHECK_QUERY} 
                   ${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
@@ -88,8 +87,26 @@ export async function initPubSubManager(this: PubSubManager): Promise<PubSubMana
                     ${dataTriggerCheckQuery}
                 END IF;
  
+              END $$;`
+
+            const queryTimeoutMillis = Math.min(5e3, Math.round(this.appCheckFrequencyMS/2));
+            this.db.any(`                     
+              DO $$
+              BEGIN
+                /* 
+                  ${REALTIME_TRIGGER_CHECK_QUERY} 
+                  ${PubSubManager.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
+                */
+                DO $$ 
+                BEGIN
+                  PERFORM pg_sleep(\${queryTimeoutMillis}/1e3);
+                  SELECT pg_cancel_backend(pid)
+                  FROM pg_catalog.pg_stat_activity
+                  WHERE pid <> pg_backend_pid()
+                  AND query = \${checkForStaleTriggers};
+                END $$;
               END $$;
-          `
+            `, { queryTimeoutMillis, checkForStaleTriggers })
             await this.db.any(checkForStaleTriggers);
             tries = 5;
             log("updated last_check");

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.1.88",
+  "version": "4.1.89",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/tests/client/PID.txt b/tests/client/PID.txt
@@ -1 +1 @@
-2319940
+2604230
diff --git a/tests/server/package-lock.json b/tests/server/package-lock.json