wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-05-13 02:41:11 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Close communication api (#8440)

Browse Source 
Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
This commit is contained in:
Kristina 2025-04-02 18:58:56 +04:00 committed by GitHub
parent fe5c74f298
commit 241d08fd89
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
server/server/src/sessionManager.ts
View File

@ -1008,21 +1008,7 @@ export class TSessionManager implements SessionManager {
closeS(s[1].session, s[1].socket) closeS(s[1].session, s[1].socket)
}) })
const closePipeline = async (): Promise<void> => { await closeWorkspace(this.ctx, workspace)
try {
await this.ctx.with('close-pipeline', {}, async () => {
await (await workspace.pipeline).close()
})
} catch (err: any) {
Analytics.handleError(err)
this.ctx.error('close-pipeline-error', { error: err })
}
}
await this.ctx.with('closing', {}, async () => {
const to = timeoutPromise(120000)
await Promise.race([closePipeline(), to.promise])
to.cancelHandle()
})
if (LOGGING_ENABLED) { if (LOGGING_ENABLED) {
this.ctx.warn('Workspace closed...', { workspace: workspace.id, wsId, wsName: workspace.workspaceName }) this.ctx.warn('Workspace closed...', { workspace: workspace.id, wsId, wsName: workspace.workspaceName })
} }
@ -1059,13 +1045,7 @@ export class TSessionManager implements SessionManager {
} }
try { try {
if (workspace.sessions.size === 0) { if (workspace.sessions.size === 0) {
const pl = await workspace.pipeline await closeWorkspace(this.ctx, workspace)
let to = timeoutPromise(60000)
await Promise.race([pl, to.promise])
to.cancelHandle()
to = timeoutPromise(60000)
await Promise.race([pl.close(), to])
to.cancelHandle()
if (this.workspaces.get(wsUuid)?.id === wsUID) { if (this.workspaces.get(wsUuid)?.id === wsUID) {
this.workspaces.delete(wsUuid) this.workspaces.delete(wsUuid)
@ -1463,3 +1443,33 @@ export function startSessionManager (
sessionManager: sessions sessionManager: sessions
} }
} }
async function closeWorkspace (ctx: MeasureContext, workspace: Workspace): Promise<void> {
const closePipeline = async (): Promise<void> => {
try {
await ctx.with('close-pipeline', {}, async () => {
await (await workspace.pipeline).close()
})
} catch (err: any) {
Analytics.handleError(err)
ctx.error('close-pipeline-error', { error: err })
}
}
const closeCommunicationApi = async (): Promise<void> => {
try {
await ctx.with('close-communication-api', {}, async () => {
await (await workspace.communicationApi).close()
})
} catch (err: any) {
Analytics.handleError(err)
ctx.error('close-pipeline-error', { error: err })
}
}
await ctx.with('closing', {}, async () => {
const to = timeoutPromise(120000)
const closePromises = [closePipeline(), closeCommunicationApi()]
await Promise.race([Promise.all(closePromises), to.promise])
to.cancelHandle()
})
}