MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing merge issue

This commit is contained in:
Rory Powell 2023-07-19 17:18:37 +01:00
parent ecf75a9685
commit 6631c2644d
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/backend-core/src/logging/index.ts
View File

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

2
packages/backend-core/src/logging/pino/logger.ts
View File

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

8
qa-core/src/jest/jestSetup.ts
View File

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