Merge branch 'main' into iain/objectsender-expose-transport-options

packages/fileimport-service/knex.js

@@ -10,7 +10,9 @@ module.exports = require('knex')({
   },
   pool: {
     min: 0,
-    max: parseInt(process.env.POSTGRES_MAX_CONNECTIONS_FILE_IMPORT_SERVICE) || 1
+    max: parseInt(process.env.POSTGRES_MAX_CONNECTIONS_FILE_IMPORT_SERVICE) || 1,
+    acquireTimeoutMillis: 16000, //allows for 3x creation attempts plus idle time between attempts
+    createTimeoutMillis: 5000
   }
   // migrations are in managed in the server package
 })

packages/frontend-2/components/project/page/models/Card.vue

@@ -170,7 +170,7 @@ const showActionsMenu = ref(false)
 
 const containerClasses = computed(() => {
   const classParts = [
-    'group rounded-xl bg-foundation border border-outline-3 hover:border-outline-5 w-full'
+    'group rounded-xl bg-foundation border border-outline-3 hover:border-outline-5 w-full z-[0]'
   ]
 
   if (versionCount.value > 0) {

packages/preview-service/knex.js

@@ -10,7 +10,9 @@ module.exports = require('knex')({
   },
   pool: {
     min: 0,
-    max: parseInt(process.env.POSTGRES_MAX_CONNECTIONS_PREVIEW_SERVICE) || 2
+    max: parseInt(process.env.POSTGRES_MAX_CONNECTIONS_PREVIEW_SERVICE) || 2,
+    acquireTimeoutMillis: 16000, //allows for 3x creation attempts plus idle time between attempts
+    createTimeoutMillis: 5000
   }
   // migrations are in managed in the server package
 })

packages/server/knexfile.js

@@ -92,7 +92,12 @@ const commonConfig = {
   },
   // we wish to avoid leaking sql queries in the logs: https://knexjs.org/guide/#compilesqlonerror
   compileSqlOnError: false,
-  pool: { min: 0, max: postgresMaxConnections() }
+  pool: {
+    min: 0,
+    max: postgresMaxConnections(),
+    acquireTimeoutMillis: 16000, //allows for 3x creation attempts plus idle time between attempts
+    createTimeoutMillis: 5000
+  }
 }
 
 /** @type {Object<string, import('knex').Knex.Config>} */

packages/webhook-service/src/knex.js

@@ -10,7 +10,9 @@ module.exports = require('knex')({
   },
   pool: {
     min: 0,
-    max: parseInt(process.env.POSTGRES_MAX_CONNECTIONS_WEBHOOK_SERVICE) || 1
+    max: parseInt(process.env.POSTGRES_MAX_CONNECTIONS_WEBHOOK_SERVICE) || 1,
+    acquireTimeoutMillis: 16000, //allows for 3x creation attempts plus idle time between attempts
+    createTimeoutMillis: 5000
   }
   // migrations are in managed in the server package
 })