Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

fix(control-api): r6-m2 stop oauth refresh cron on shutdown

Josué554333dade18
diff --git a/control-api/package-lock.json b/control-api/package-lock.json
index 9c880649c..681d569f4 100644
--- a/control-api/package-lock.json
+++ b/control-api/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-api",
- "version": "0.1.681",
+ "version": "0.1.682",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-api",
- "version": "0.1.681",
+ "version": "0.1.682",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/grok-provider-attempt-contract": "file:../packages/grok-provider-attempt-contract",
diff --git a/control-api/package.json b/control-api/package.json
index 2e64e8220..e82aab44f 100644
--- a/control-api/package.json
+++ b/control-api/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-api",
- "version": "0.1.681",
+ "version": "0.1.682",
"description": "Internal Clerum control plane REST API + UI for managing CRDs and secrets",
"main": "dist/main.js",
"engines": {
diff --git a/control-api/src/main.ts b/control-api/src/main.ts
index 725529ecc..3dd106674 100644
--- a/control-api/src/main.ts
+++ b/control-api/src/main.ts
@@ -92,6 +92,7 @@ const shutdown = createShutdownHandler(async () => {
'workflow-runs-archive-cron': stopWorkflowRunsArchiveCron,
'workflow-schedule-worker': stopWorkflowScheduleWorker,
'workflow-approval-notification-worker': stopWorkflowApprovalNotificationDeliveryWorker,
+ 'oauth-proactive-refresh-cron': stopOauthProactiveRefreshCron,
'workflow-approval-trace-projector': stopWorkflowApprovalTraceProjector,
'entity-change-dispatcher': stopEntityChangeDispatcher,
'core-database-pool': () => pool.end(),
@@ -317,12 +318,19 @@ async function main(): Promise<void> {
reactiveBufferMs: REACTIVE_REFRESH_BUFFER_MS,
dcrWarnMs: config.oauthDcrSecretWarnMs,
})
- console.log(
- `[ControlAPI] OAuth proactive refresh cron enabled (interval=${config.oauthProactiveRefreshIntervalMs}ms, Bp=${config.oauthProactiveRefreshBufferMs}ms, Wc=${config.oauthDcrSecretWarnMs}ms)`
+ logger.info(
+ {
+ event: 'oauth_proactive_refresh_cron_enabled',
+ intervalMs: config.oauthProactiveRefreshIntervalMs,
+ proactiveBufferMs: config.oauthProactiveRefreshBufferMs,
+ dcrWarnMs: config.oauthDcrSecretWarnMs,
+ },
+ 'OAuth proactive refresh cron enabled'
)
} else {
- console.log(
- '[ControlAPI] OAuth proactive refresh cron disabled (OAUTH_PROACTIVE_REFRESH_CRON_ENABLED not "true")'
+ logger.info(
+ { event: 'oauth_proactive_refresh_cron_disabled' },
+ 'OAuth proactive refresh cron disabled'
)
}
diff --git a/control-api/src/shutdown.ts b/control-api/src/shutdown.ts
index ce8f3a4d1..a1b7ded79 100644
--- a/control-api/src/shutdown.ts
+++ b/control-api/src/shutdown.ts
@@ -24,6 +24,7 @@ export const CONTROL_API_SHUTDOWN_STEP_NAMES = [
'workflow-runs-archive-cron',
'workflow-schedule-worker',
'workflow-approval-notification-worker',
+ 'oauth-proactive-refresh-cron',
'workflow-approval-trace-projector',
'entity-change-dispatcher',
'core-database-pool',
diff --git a/control-api/test/shutdown.test.ts b/control-api/test/shutdown.test.ts
index 660946c23..693c334be 100644
--- a/control-api/test/shutdown.test.ts
+++ b/control-api/test/shutdown.test.ts
@@ -7,6 +7,16 @@ import {
} from '../src/shutdown.js'
describe('Control API shutdown', () => {
+ it('stops the OAuth proactive refresh cron before database pools close', () => {
+ const names = [...CONTROL_API_SHUTDOWN_STEP_NAMES] as string[]
+ const cronIndex = names.indexOf('oauth-proactive-refresh-cron')
+ const poolIndex = names.indexOf('core-database-pool')
+
+ expect(names).toContain('oauth-proactive-refresh-cron')
+ expect(cronIndex).toBeGreaterThanOrEqual(0)
+ expect(poolIndex).toBeGreaterThan(cronIndex)
+ })
+
it('closes every registered resource in order and continues after failures', async () => {
const completed: string[] = []
const actions = Object.fromEntries(
@@ -23,6 +33,9 @@ describe('Control API shutdown', () => {
expect(completed).toEqual(CONTROL_API_SHUTDOWN_STEP_NAMES)
expect(Object.keys(actions).sort()).toEqual([...CONTROL_API_SHUTDOWN_STEP_NAMES].sort())
+ expect(completed.indexOf('oauth-proactive-refresh-cron')).toBeLessThan(
+ completed.indexOf('core-database-pool')
+ )
expect(result.errors.map(error => error.name)).toEqual(['rate-limit-cleanup'])
expect(result.timedOut).toBe(false)
})