Fixing merge issue

packages/backend-core/src/logging/index.ts

@@ -2,6 +2,3 @@ export * as correlation from "./correlation/correlation"
 export { logger } from "./pino/logger"
 export * from "./alerts"
 export * as system from "./system"
-
-// turn off or on context logging i.e. tenantId, appId etc
-export let LOG_CONTEXT = true

packages/backend-core/src/logging/pino/logger.ts

@@ -2,11 +2,9 @@ import pino, { LoggerOptions } from "pino"
 import pinoPretty from "pino-pretty"
 
 import { IdentityType } from "@budibase/types"
-
 import env from "../../environment"
 import * as context from "../../context"
 import * as correlation from "../correlation"
-import { LOG_CONTEXT } from "../index"
 
 import { localFileDestination } from "../system"
 

qa-core/src/jest/jestSetup.ts

@@ -1,5 +1,3 @@
-import { logging } from "@budibase/backend-core"
-logging.LOG_CONTEXT = false
-
-jest.retryTimes(2)
-jest.setTimeout(60000)
+const envTimeout = process.env.JEST_TIMEOUT
+const timeout = envTimeout && parseInt(envTimeout)
+jest.setTimeout(timeout || 60000)