Skip to content

Commit 186e35c

Browse files
authored
fix: initialize secret before storage in front (#8324)
Signed-off-by: Alexander Onnikov <[email protected]>
1 parent cd97f6f commit 186e35c

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

Diff for: pods/server/src/__start.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ const metricsContext = initStatisticsContext('transactor', {
5858
setOperationLogProfiling(process.env.OPERATION_PROFILING === 'true')
5959

6060
const config = serverConfigFromEnv()
61-
const storageConfig: StorageConfiguration = storageConfigFromEnv()
6261

6362
const usePrepare = (process.env.DB_PREPARE ?? 'true') === 'true'
6463

@@ -79,6 +78,8 @@ setMetadata(serverAiBot.metadata.SupportWorkspaceId, process.env.SUPPORT_WORKSPA
7978
setMetadata(serverAiBot.metadata.EndpointURL, process.env.AI_BOT_URL)
8079
setMetadata(serverCalendar.metadata.EndpointURL, process.env.CALENDAR_URL)
8180

81+
const storageConfig: StorageConfiguration = storageConfigFromEnv()
82+
8283
const { shutdown, sessionManager } = start(metricsContext, config.dbUrl, {
8384
fulltextUrl: config.fulltextUrl,
8485
storageConfig,

Diff for: server/front/src/starter.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ import { start } from '.'
2424
export function startFront (ctx: MeasureContext, extraConfig?: Record<string, string | undefined>): void {
2525
const SERVER_PORT = parseInt(process.env.SERVER_PORT ?? '8080')
2626

27+
const serverSecret = process.env.SERVER_SECRET
28+
if (serverSecret === undefined) {
29+
console.log('Please provide server secret')
30+
process.exit(1)
31+
}
32+
33+
setMetadata(serverToken.metadata.Secret, serverSecret)
34+
2735
const storageConfig: StorageConfiguration = storageConfigFromEnv()
2836
const storageAdapter = buildStorageFromConfig(storageConfig)
2937

@@ -83,12 +91,6 @@ export function startFront (ctx: MeasureContext, extraConfig?: Record<string, st
8391
process.exit(1)
8492
}
8593

86-
const serverSecret = process.env.SERVER_SECRET
87-
if (serverSecret === undefined) {
88-
console.log('Please provide server secret')
89-
process.exit(1)
90-
}
91-
9294
let uploadConfig = process.env.UPLOAD_CONFIG
9395
if (uploadConfig === undefined) {
9496
uploadConfig = ''
@@ -111,8 +113,6 @@ export function startFront (ctx: MeasureContext, extraConfig?: Record<string, st
111113

112114
const linkPreviewUrl = process.env.LINK_PREVIEW_URL
113115

114-
setMetadata(serverToken.metadata.Secret, serverSecret)
115-
116116
const disableSignUp = process.env.DISABLE_SIGNUP
117117

118118
const config = {

0 commit comments

Comments
 (0)