fix(core): Ensure TTL safeguard for test webhooks applies only to multi-main setup (#9062)

This commit is contained in:
Iván Ovejero
2024-04-05 14:15:49 +02:00
committed by GitHub
parent ff77ef4b62
commit ff81de3313
3 changed files with 22 additions and 7 deletions

View File

@@ -2,7 +2,7 @@ import EventEmitter from 'node:events';
import { Service } from 'typedi';
import { caching } from 'cache-manager';
import { jsonStringify } from 'n8n-workflow';
import { ApplicationError, jsonStringify } from 'n8n-workflow';
import config from '@/config';
import { getDefaultRedisClient, getRedisPrefix } from '@/services/redis/RedisServiceHelper';
@@ -137,10 +137,9 @@ export class CacheService extends EventEmitter {
if (!key?.length) return;
if (this.cache.kind === 'memory') {
setTimeout(async () => {
await this.cache.store.del(key);
}, ttlMs);
return;
throw new ApplicationError('Method `expire` not yet implemented for in-memory cache', {
level: 'warning',
});
}
await this.cache.store.expire(key, ttlMs / TIME.SECOND);

View File

@@ -3,6 +3,7 @@ import { CacheService } from '@/services/cache/cache.service';
import type { IWebhookData } from 'n8n-workflow';
import type { IWorkflowDb } from '@/Interfaces';
import { TEST_WEBHOOK_TIMEOUT, TEST_WEBHOOK_TIMEOUT_BUFFER } from '@/constants';
import { OrchestrationService } from './orchestration.service';
export type TestWebhookRegistration = {
pushRef?: string;
@@ -13,7 +14,10 @@ export type TestWebhookRegistration = {
@Service()
export class TestWebhookRegistrationsService {
constructor(private readonly cacheService: CacheService) {}
constructor(
private readonly cacheService: CacheService,
private readonly orchestrationService: OrchestrationService,
) {}
private readonly cacheKey = 'test-webhooks';
@@ -22,6 +26,8 @@ export class TestWebhookRegistrationsService {
await this.cacheService.setHash(this.cacheKey, { [hashKey]: registration });
if (!this.orchestrationService.isMultiMainSetupEnabled) return;
/**
* Multi-main setup: In a manual webhook execution, the main process that
* handles a webhook might not be the same as the main process that created