CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-08-05 05:11:43 +12:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13916 from Budibase/fix/env-logging-and-move-app-migrations

Browse source 
Moving app migrations back to API service.
This commit is contained in:
Michael Drury 2024-06-11 15:58:35 +01:00 committed by GitHub
commit 5b385ce8ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/server/src/appMigrations/appMigrationMetadata.ts
View file

@ -25,8 +25,8 @@ export async function getAppMigrationVersion(appId: string): Promise<string> {
let metadata: AppMigrationDoc | undefined = await cache.get(cacheKey)
// We don't want to cache in dev or QA, in order to be able to tweak it
if (metadata && !env.isDev() && !env.isQA()) {
// We don't want to cache in dev in order to be able to tweak it
if (metadata && !env.isDev()) {
return metadata.version
}

15
packages/server/src/startup/index.ts
View file

@ -20,7 +20,7 @@ import * as pro from "@budibase/pro"
import * as api from "../api"
import sdk from "../sdk"
import { initialise as initialiseWebsockets } from "../websockets"
import { automationsEnabled, printFeatures } from "../features"
import { apiEnabled, automationsEnabled, printFeatures } from "../features"
import * as jsRunner from "../jsRunner"
import Koa from "koa"
import { Server } from "http"
@ -70,13 +70,12 @@ export async function startup(
return
}
printFeatures()
if (env.BUDIBASE_ENVIRONMENT) {
console.log(`service running environment: "${env.BUDIBASE_ENVIRONMENT}"`)
}
STARTUP_RAN = true
if (app && server && !env.CLUSTER_MODE) {
let startupLog = `Budibase running on ${JSON.stringify(server.address())}`
if (env.BUDIBASE_ENVIRONMENT) {
startupLog = `${startupLog} - environment: "${env.BUDIBASE_ENVIRONMENT}"`
}
console.log(startupLog)
console.log(`Budibase running on ${JSON.stringify(server.address())}`)
const address = server.address() as AddressInfo
env._set("PORT", address.port)
}
@ -121,9 +120,11 @@ export async function startup(
queuePromises.push(events.processors.init(pro.sdk.auditLogs.write))
// app migrations and automations on other service
if (automationsEnabled()) {
queuePromises.push(appMigrations.init())
queuePromises.push(automations.init())
}
if (apiEnabled()) {
queuePromises.push(appMigrations.init())
}
queuePromises.push(initPro())
if (app) {
// bring routes online as final step once everything ready