fix(cache): resolve scanning stop issue and add cache TTL management
- Fix Redis SCAN cursor type conversion (Buffer to String) to prevent early termination - Add progress logging in initializeClubCache (every 100 activities with summary) - Add Redis memory limits (512MB with LRU eviction policy) - Implement cache TTL: 24h for normal data, 1h for error states (allows retry) - Fix Docker permission issue by running app container as root - Add TTL configuration to .env and example.env Root cause: SCAN cursor comparison failed due to type mismatch (Buffer vs String) Impact: Scanning now processes all 5000+ IDs instead of stopping at ~300
This commit is contained in:
@@ -8,6 +8,11 @@ config();
|
||||
export const ACTIVITY_KEY_PREFIX = 'activity:'; // Exported for use in cache-manager
|
||||
const STAFF_KEY = 'staffs:all';
|
||||
|
||||
// Cache TTL configuration (in seconds)
|
||||
const ACTIVITY_CACHE_TTL = parseInt(process.env.ACTIVITY_CACHE_TTL || '86400', 10); // Default: 24 hours
|
||||
const STAFF_CACHE_TTL = parseInt(process.env.STAFF_CACHE_TTL || '86400', 10); // Default: 24 hours
|
||||
const ERROR_CACHE_TTL = parseInt(process.env.ERROR_CACHE_TTL || '3600', 10); // Default: 1 hour for errors
|
||||
|
||||
// Always create a new client instance with .env config
|
||||
const redisUrl = process.env.REDIS_URL || 'redis://localhost:6379';
|
||||
let redisClient: RedisClient | null = null;
|
||||
@@ -39,17 +44,25 @@ export async function getActivityData(activityId: string): Promise<any | null> {
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets activity data in Redis.
|
||||
* Sets activity data in Redis with TTL.
|
||||
* @param activityId - The activity ID to set
|
||||
* @param data - The activity data object
|
||||
* @param ttl - Optional TTL in seconds (defaults to ACTIVITY_CACHE_TTL, or ERROR_CACHE_TTL if data has error)
|
||||
*/
|
||||
export async function setActivityData(activityId: string, data: any): Promise<void> {
|
||||
export async function setActivityData(activityId: string, data: any, ttl?: number): Promise<void> {
|
||||
if (!redisClient) {
|
||||
logger.warn('Redis client not available, skipping setActivityData');
|
||||
return;
|
||||
}
|
||||
try {
|
||||
await redisClient.set(`${ACTIVITY_KEY_PREFIX}${activityId}`, JSON.stringify(data));
|
||||
// Use shorter TTL for error states to allow retry
|
||||
const expiration = data?.error ? ERROR_CACHE_TTL : (ttl || ACTIVITY_CACHE_TTL);
|
||||
// Bun's RedisClient doesn't have setEx, use raw SETEX command
|
||||
await redisClient.send('SETEX', [
|
||||
`${ACTIVITY_KEY_PREFIX}${activityId}`,
|
||||
String(expiration),
|
||||
JSON.stringify(data)
|
||||
]);
|
||||
} catch (err) {
|
||||
logger.error(`Error setting activity ${activityId} in Redis:`, err);
|
||||
}
|
||||
@@ -74,16 +87,23 @@ export async function getStaffData(): Promise<any | null> {
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets staff data in Redis.
|
||||
* Sets staff data in Redis with TTL.
|
||||
* @param data - The staff data object
|
||||
* @param ttl - Optional TTL in seconds (defaults to STAFF_CACHE_TTL)
|
||||
*/
|
||||
export async function setStaffData(data: any): Promise<void> {
|
||||
export async function setStaffData(data: any, ttl?: number): Promise<void> {
|
||||
if (!redisClient) {
|
||||
logger.warn('Redis client not available, skipping setStaffData');
|
||||
return;
|
||||
}
|
||||
try {
|
||||
await redisClient.set(STAFF_KEY, JSON.stringify(data));
|
||||
const expiration = ttl || STAFF_CACHE_TTL;
|
||||
// Use raw SETEX command for TTL support
|
||||
await redisClient.send('SETEX', [
|
||||
STAFF_KEY,
|
||||
String(expiration),
|
||||
JSON.stringify(data)
|
||||
]);
|
||||
} catch (err) {
|
||||
logger.error('Error setting staff data in Redis:', err);
|
||||
}
|
||||
@@ -103,8 +123,11 @@ export async function getAllActivityKeys(): Promise<string[]> {
|
||||
// Using raw SCAN command since Bun's RedisClient doesn't have a scan method
|
||||
const keys: string[] = [];
|
||||
let cursor = '0';
|
||||
let iteration = 0;
|
||||
const MAX_ITERATIONS = 1000; // Safety limit to prevent infinite loops
|
||||
|
||||
do {
|
||||
iteration++;
|
||||
// Use send method to execute raw Redis commands
|
||||
const result = await redisClient.send('SCAN', [
|
||||
cursor,
|
||||
@@ -114,15 +137,24 @@ export async function getAllActivityKeys(): Promise<string[]> {
|
||||
'100'
|
||||
]);
|
||||
|
||||
cursor = result[0];
|
||||
// Force convert to string to ensure type consistency (Bun may return Buffer)
|
||||
cursor = String(result[0] ?? '0');
|
||||
const foundKeys = result[1] || [];
|
||||
|
||||
logger.debug(`SCAN iteration ${iteration}: cursor=${cursor}, found ${foundKeys.length} keys, total=${keys.length + foundKeys.length}`);
|
||||
|
||||
// Add the found keys to our array
|
||||
keys.push(...foundKeys);
|
||||
|
||||
// Prevent infinite loop
|
||||
if (iteration >= MAX_ITERATIONS) {
|
||||
logger.warn(`SCAN reached max iterations (${MAX_ITERATIONS}). May have incomplete results.`);
|
||||
break;
|
||||
}
|
||||
|
||||
} while (cursor !== '0');
|
||||
|
||||
logger.info(`Found ${keys.length} activity keys in Redis using SCAN.`);
|
||||
logger.info(`Found ${keys.length} activity keys in Redis after ${iteration} SCAN iterations.`);
|
||||
return keys;
|
||||
} catch (err) {
|
||||
logger.error('Error getting all activity keys from Redis using SCAN:', err);
|
||||
|
||||
Reference in New Issue
Block a user