@budibase/server 2.6.18 → 2.6.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@budibase/server",
3
3
  "email": "hi@budibase.com",
4
- "version": "2.6.18",
4
+ "version": "2.6.19",
5
5
  "description": "Budibase Web Server",
6
6
  "main": "src/index.ts",
7
7
  "repository": {
@@ -45,12 +45,12 @@
45
45
  "license": "GPL-3.0",
46
46
  "dependencies": {
47
47
  "@apidevtools/swagger-parser": "10.0.3",
48
- "@budibase/backend-core": "^2.6.18",
49
- "@budibase/client": "^2.6.18",
50
- "@budibase/pro": "2.6.17",
51
- "@budibase/shared-core": "^2.6.18",
52
- "@budibase/string-templates": "^2.6.18",
53
- "@budibase/types": "^2.6.18",
48
+ "@budibase/backend-core": "^2.6.19",
49
+ "@budibase/client": "^2.6.19",
50
+ "@budibase/pro": "2.6.18",
51
+ "@budibase/shared-core": "^2.6.19",
52
+ "@budibase/string-templates": "^2.6.19",
53
+ "@budibase/types": "^2.6.19",
54
54
  "@bull-board/api": "3.7.0",
55
55
  "@bull-board/koa": "3.9.4",
56
56
  "@elastic/elasticsearch": "7.10.0",
@@ -176,5 +176,5 @@
176
176
  "optionalDependencies": {
177
177
  "oracledb": "5.3.0"
178
178
  },
179
- "gitHead": "6e97c358e00e4a7be0c620858c564960c393c1b8"
179
+ "gitHead": "ef8ac7e2e16f83f8d7475d310302cd22aa57fdd2"
180
180
  }
@@ -17,10 +17,16 @@ const CRON_STEP_ID = definitions.CRON.stepId
17
17
  const Runner = new Thread(ThreadType.AUTOMATION)
18
18
 
19
19
  function loggingArgs(job: AutomationJob) {
20
- return {
21
- jobId: job.id,
22
- trigger: job.data.automation.definition.trigger.event,
23
- }
20
+ return [
21
+ {
22
+ _logKey: "automation",
23
+ trigger: job.data.automation.definition.trigger.event,
24
+ },
25
+ {
26
+ _logKey: "bull",
27
+ jobId: job.id,
28
+ },
29
+ ]
24
30
  }
25
31
 
26
32
  export async function processEvent(job: AutomationJob) {
@@ -29,16 +35,16 @@ export async function processEvent(job: AutomationJob) {
29
35
  const task = async () => {
30
36
  try {
31
37
  // need to actually await these so that an error can be captured properly
32
- console.log("automation running", loggingArgs(job))
38
+ console.log("automation running", ...loggingArgs(job))
33
39
 
34
40
  const runFn = () => Runner.run(job)
35
41
  const result = await quotas.addAutomation(runFn, {
36
42
  automationId,
37
43
  })
38
- console.log("automation completed", loggingArgs(job))
44
+ console.log("automation completed", ...loggingArgs(job))
39
45
  return result
40
46
  } catch (err) {
41
- console.error(`automation was unable to run`, err, loggingArgs(job))
47
+ console.error(`automation was unable to run`, err, ...loggingArgs(job))
42
48
  return { err }
43
49
  }
44
50
  }