@budibase/server 2.6.19-alpha.30 → 2.6.19-alpha.34

package/dist/query.js

@@ -3143,6 +3143,7 @@ var init_logger = __esm({
         }
         const mergingObject = {
           err: error,
+          pid: process.pid,
           ...contextObject
         };
         if (objects.length) {
@@ -5571,6 +5572,7 @@ var environment = {
   ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
   SELF_HOSTED: process.env.SELF_HOSTED,
   HTTP_MB_LIMIT: process.env.HTTP_MB_LIMIT,
+  FORKED_PROCESS_NAME: process.env.FORKED_PROCESS_NAME || "main",
   // old
   CLIENT_ID: process.env.CLIENT_ID,
   _set(key, value) {
@@ -5896,14 +5898,15 @@ init_src();
 // ../backend-core/src/redis/redlockImpl.ts
 var redlockImpl_exports = {};
 __export(redlockImpl_exports, {
-  doWithLock: () => doWithLock
+  doWithLock: () => doWithLock,
+  newRedlock: () => newRedlock
 });
 var import_redlock = __toESM(require("redlock"));
 init_init();
 init_src();
 init_context2();
 init_environment2();
-var getClient = async (type, opts) => {
+async function getClient(type, opts) {
   if (type === "custom" /* CUSTOM */) {
     return newRedlock(opts);
   }
@@ -5914,6 +5917,9 @@ var getClient = async (type, opts) => {
     case "try_once" /* TRY_ONCE */: {
       return newRedlock(OPTIONS.TRY_ONCE);
     }
+    case "try_twice" /* TRY_TWICE */: {
+      return newRedlock(OPTIONS.TRY_TWICE);
+    }
     case "default" /* DEFAULT */: {
       return newRedlock(OPTIONS.DEFAULT);
     }
@@ -5924,12 +5930,15 @@ var getClient = async (type, opts) => {
       throw new Error(`Could not get redlock client: ${type}`);
     }
   }
-};
+}
 var OPTIONS = {
   TRY_ONCE: {
     // immediately throws an error if the lock is already held
     retryCount: 0
   },
+  TRY_TWICE: {
+    retryCount: 1
+  },
   TEST: {
     // higher retry count in unit tests
     // due to high contention.
@@ -5956,21 +5965,25 @@ var OPTIONS = {
     retryDelay: 500
   }
 };
-var newRedlock = async (opts = {}) => {
+async function newRedlock(opts = {}) {
   let options2 = { ...OPTIONS.DEFAULT, ...opts };
   const redisWrapper = await getLockClient();
   const client3 = redisWrapper.getClient();
   return new import_redlock.default([client3], options2);
-};
-var doWithLock = async (opts, task) => {
+}
+function getLockName(opts) {
+  const prefix = opts.systemLock ? "system" : getTenantId();
+  let name = `lock:${prefix}_${opts.name}`;
+  if (opts.resource) {
+    name = name + `_${opts.resource}`;
+  }
+  return name;
+}
+async function doWithLock(opts, task) {
   const redlock = await getClient(opts.type, opts.customOptions);
   let lock;
   try {
-    const prefix = opts.systemLock ? "system" : getTenantId();
-    let name = `lock:${prefix}_${opts.name}`;
-    if (opts.resource) {
-      name = name + `_${opts.resource}`;
-    }
+    const name = getLockName(opts);
     lock = await redlock.lock(name, opts.ttl);
     const result = await task();
     return { executed: true, result };
@@ -5978,7 +5991,6 @@ var doWithLock = async (opts, task) => {
     console.warn("lock error");
     if (e.name === "LockError") {
       if (opts.type === "try_once" /* TRY_ONCE */) {
-        console.warn(e);
         return { executed: false };
       } else {
         console.error(e);
@@ -5993,7 +6005,7 @@ var doWithLock = async (opts, task) => {
       await lock.unlock();
     }
   }
-};
+}
 
 // ../backend-core/src/platform/tenants.ts
 var TENANT_DOC = StaticDatabases.PLATFORM_INFO.docs.tenants;
@@ -12928,8 +12940,10 @@ function makeVariableKey(queryId, variable) {
 }
 function threadSetup() {
   if (environment_default.isTest() || environment_default.DISABLE_THREADING || !environment_default.isInThread()) {
+    console.debug(`[${environment_default.FORKED_PROCESS_NAME}] thread setup skipped`);
     return;
   }
+  console.debug(`[${environment_default.FORKED_PROCESS_NAME}] thread setup running`);
   init8();
 }
 async function checkCacheForDynamicVariable(queryId, variable) {