min
diff --git a/pods/server/src/server_http.ts b/pods/server/src/server_http.ts
index 4a092bf830..aae3efc569 100644
--- a/pods/server/src/server_http.ts
+++ b/pods/server/src/server_http.ts
@@ -205,6 +205,7 @@ export function startHttpServer (
try {
const token = (req.query.token as string) ?? (req.headers.authorization ?? '').split(' ')[1]
const payload = decodeToken(token)
+
if (payload.extra?.admin !== 'true' && payload.account !== systemAccountUuid) {
console.warn('Non admin attempt to maintenance action', { payload })
res.writeHead(404, {})
@@ -216,11 +217,13 @@ export function startHttpServer (
switch (operation) {
case 'maintenance': {
- const timeMinutes = parseInt((req.query.timeout as string) ?? '5')
- sessions.scheduleMaintenance(timeMinutes)
+ void retrieveJson(req).then((message) => {
+ const timeMinutes = parseInt((req.query.timeout as string) ?? '5')
+ sessions.scheduleMaintenance(timeMinutes, message)
- res.writeHead(200)
- res.end()
+ res.writeHead(200)
+ res.end()
+ })
return
}
case 'wipe-statistics': {
diff --git a/server/account-service/src/index.ts b/server/account-service/src/index.ts
index c439ac065a..0611617bc6 100644
--- a/server/account-service/src/index.ts
+++ b/server/account-service/src/index.ts
@@ -312,8 +312,13 @@ export function serveAccount (measureCtx: MeasureContext, brandings: BrandingMap
const transactors = getAllTransactors(EndpointKind.Internal)
for (const tr of transactors) {
const serverEndpoint = tr.replaceAll('wss://', 'https://').replace('ws://', 'http://')
+ const jsonBody = JSON.stringify(req.request.body as any)
await fetch(serverEndpoint + `/api/v1/manage?token=${token}&operation=maintenance&timeout=${timeMinutes}`, {
- method: 'PUT'
+ method: 'PUT',
+ body: jsonBody,
+ headers: {
+ 'Content-Type': 'application/json;charset=utf-8'
+ }
})
}
diff --git a/server/core/src/types.ts b/server/core/src/types.ts
index dc3b127eca..5c3ae9cea5 100644
--- a/server/core/src/types.ts
+++ b/server/core/src/types.ts
@@ -729,7 +729,7 @@ export interface SessionManager {
closeWorkspaces: (ctx: MeasureContext) => Promise
- scheduleMaintenance: (timeMinutes: number) => void
+ scheduleMaintenance: (timeMinutes: number, message?: string) => void
profiling?: {
start: () => void
diff --git a/server/server/src/sessionManager.ts b/server/server/src/sessionManager.ts
index 88c98de699..08ba0c147d 100644
--- a/server/server/src/sessionManager.ts
+++ b/server/server/src/sessionManager.ts
@@ -109,6 +109,7 @@ export class TSessionManager implements SessionManager {
maintenanceTimer: any
timeMinutes = 0
+ maintenanceMessage?: string
modelVersion = process.env.MODEL_VERSION ?? ''
serverVersion = process.env.VERSION ?? ''
@@ -146,8 +147,9 @@ export class TSessionManager implements SessionManager {
this.ticksContext = ctx.newChild('ticks', {})
}
- scheduleMaintenance (timeMinutes: number): void {
+ scheduleMaintenance (timeMinutes: number, message?: string): void {
this.timeMinutes = timeMinutes
+ this.maintenanceMessage = message
this.sendMaintenanceWarning()
@@ -190,7 +192,8 @@ export class TSessionManager implements SessionManager {
space: core.space.DerivedTx,
createdBy: core.account.System,
params: {
- timeMinutes: this.timeMinutes
+ timeMinutes: this.timeMinutes,
+ message: this.maintenanceMessage
}
}
}
@@ -306,7 +309,7 @@ export class TSessionManager implements SessionManager {
wsId,
total: s.session.requests.size,
user: s.session.getUser(),
- ...cutObjectArray(r.params)
+ params: cutObjectArray(r.params)
})
}
}