mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-06 13:27:22 +00:00
fix(server): auditlog won't push if retention period is zero
This commit is contained in:
@@ -22,23 +22,13 @@ export const auditLogQueueServiceFactory = ({
|
|||||||
licenseService
|
licenseService
|
||||||
}: TAuditLogQueueServiceFactoryDep) => {
|
}: TAuditLogQueueServiceFactoryDep) => {
|
||||||
const pushToLog = async (data: TCreateAuditLogDTO) => {
|
const pushToLog = async (data: TCreateAuditLogDTO) => {
|
||||||
await queueService.queue(QueueName.AuditLog, QueueJobs.AuditLog, data, {
|
let { orgId } = data;
|
||||||
removeOnFail: {
|
|
||||||
count: 5
|
|
||||||
},
|
|
||||||
removeOnComplete: true
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
queueService.start(QueueName.AuditLog, async (job) => {
|
|
||||||
const { actor, event, ipAddress, projectId, userAgent, userAgentType } = job.data;
|
|
||||||
let { orgId } = job.data;
|
|
||||||
const MS_IN_DAY = 24 * 60 * 60 * 1000;
|
const MS_IN_DAY = 24 * 60 * 60 * 1000;
|
||||||
|
|
||||||
if (!orgId) {
|
if (!orgId) {
|
||||||
// it will never be undefined for both org and project id
|
// it will never be undefined for both org and project id
|
||||||
// TODO(akhilmhdh): use caching here in dal to avoid db calls
|
// TODO(akhilmhdh): use caching here in dal to avoid db calls
|
||||||
const project = await projectDAL.findById(projectId as string);
|
const project = await projectDAL.findById(data.projectId as string);
|
||||||
orgId = project.orgId;
|
orgId = project.orgId;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -46,6 +36,26 @@ export const auditLogQueueServiceFactory = ({
|
|||||||
const ttl = plan.auditLogsRetentionDays * MS_IN_DAY;
|
const ttl = plan.auditLogsRetentionDays * MS_IN_DAY;
|
||||||
// skip inserting if audit log retention is 0 meaning its not supported
|
// skip inserting if audit log retention is 0 meaning its not supported
|
||||||
if (ttl === 0) return;
|
if (ttl === 0) return;
|
||||||
|
|
||||||
|
await queueService.queue(
|
||||||
|
QueueName.AuditLog,
|
||||||
|
QueueJobs.AuditLog,
|
||||||
|
{ ...data, orgId },
|
||||||
|
{
|
||||||
|
removeOnFail: {
|
||||||
|
count: 3
|
||||||
|
},
|
||||||
|
removeOnComplete: true
|
||||||
|
}
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
queueService.start(QueueName.AuditLog, async (job) => {
|
||||||
|
const { actor, event, ipAddress, projectId, userAgent, userAgentType, orgId } = job.data;
|
||||||
|
const MS_IN_DAY = 24 * 60 * 60 * 1000;
|
||||||
|
|
||||||
|
const plan = await licenseService.getPlan(orgId as string);
|
||||||
|
const ttl = plan.auditLogsRetentionDays * MS_IN_DAY;
|
||||||
await auditLogDAL.create({
|
await auditLogDAL.create({
|
||||||
actor: actor.type,
|
actor: actor.type,
|
||||||
actorMetadata: actor.metadata,
|
actorMetadata: actor.metadata,
|
||||||
|
|||||||
Reference in New Issue
Block a user