Merge branch 'master' into fix/add-graceful-exit-logging

avallete · web-flow · commit c586bc7efe2f · 2025-04-10T11:37:56.000+02:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -87,10 +87,8 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: docker/build-push-action@v5
+      - uses: docker/build-push-action@v6
         with:
           push: true
           platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
diff --git a/src/server/constants.ts b/src/server/constants.ts
@@ -16,6 +16,7 @@ const PG_META_DB_PASSWORD = (await getSecret('PG_META_DB_PASSWORD')) || 'postgre
 const PG_META_DB_SSL_MODE = process.env.PG_META_DB_SSL_MODE || 'disable'
 
 const PG_CONN_TIMEOUT_SECS = Number(process.env.PG_CONN_TIMEOUT_SECS || 15)
+const PG_QUERY_TIMEOUT_SECS = Number(process.env.PG_QUERY_TIMEOUT_SECS || 55)
 
 export let PG_CONNECTION = process.env.PG_META_DB_URL
 if (!PG_CONNECTION) {
@@ -58,6 +59,7 @@ export const PG_META_MAX_RESULT_SIZE = process.env.PG_META_MAX_RESULT_SIZE_MB
 export const DEFAULT_POOL_CONFIG: PoolConfig = {
   max: 1,
   connectionTimeoutMillis: PG_CONN_TIMEOUT_SECS * 1000,
+  query_timeout: PG_QUERY_TIMEOUT_SECS * 1000,
   ssl: PG_META_DB_SSL_ROOT_CERT ? { ca: PG_META_DB_SSL_ROOT_CERT } : undefined,
   application_name: `postgres-meta ${pkg.version}`,
   maxResultSize: PG_META_MAX_RESULT_SIZE,
diff --git a/src/server/utils.ts b/src/server/utils.ts
@@ -29,6 +29,8 @@ export function translateErrorToResponseCode(
     return 504
   } else if (error.message === 'sorry, too many clients already') {
     return 503
+  } else if (error.message === 'Query read timeout') {
+    return 408
   }
   return defaultResponseCode
 }

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ export function translateErrorToResponseCode(`
`29`	`29`	`return 504`
`30`	`30`	`} else if (error.message === 'sorry, too many clients already') {`
`31`	`31`	`return 503`
	`32`	`+ } else if (error.message === 'Query read timeout') {`
	`33`	`+ return 408`
`32`	`34`	`}`
`33`	`35`	`return defaultResponseCode`
`34`	`36`	`}`