fix: Run remove cancelled subscriptions only in the cloud

This commit is contained in:
Faruk AYDIN
2023-05-12 13:25:30 +02:00
committed by Ali BARIN
parent 69eca33de7
commit 07b2b18a4e
2 changed files with 30 additions and 17 deletions

View File

@@ -11,24 +11,32 @@ import appConfig from '../config/app';
const serverAdapter = new ExpressAdapter();
const queues = [
new BullMQAdapter(flowQueue),
new BullMQAdapter(triggerQueue),
new BullMQAdapter(actionQueue),
new BullMQAdapter(emailQueue),
new BullMQAdapter(deleteUserQueue),
];
if (appConfig.isCloud) {
queues.push(new BullMQAdapter(removeCancelledSubscriptionsQueue));
}
const shouldEnableBullDashboard = () => {
return (
appConfig.enableBullMQDashboard &&
appConfig.bullMQDashboardUsername &&
appConfig.bullMQDashboardPassword
);
};
const createBullBoardHandler = async (serverAdapter: ExpressAdapter) => {
if (
!appConfig.enableBullMQDashboard ||
!appConfig.bullMQDashboardUsername ||
!appConfig.bullMQDashboardPassword
)
return;
if (!shouldEnableBullDashboard) return;
createBullBoard({
queues: [
new BullMQAdapter(flowQueue),
new BullMQAdapter(triggerQueue),
new BullMQAdapter(actionQueue),
new BullMQAdapter(emailQueue),
new BullMQAdapter(deleteUserQueue),
new BullMQAdapter(removeCancelledSubscriptionsQueue),
],
serverAdapter: serverAdapter,
queues,
serverAdapter,
});
};

View File

@@ -1,4 +1,5 @@
import * as Sentry from './helpers/sentry.ee';
import appConfig from './config/app';
Sentry.init();
@@ -9,8 +10,12 @@ import './workers/trigger';
import './workers/action';
import './workers/email';
import './workers/delete-user.ee';
import './workers/remove-cancelled-subscriptions.ee';
import './queues/remove-cancelled-subscriptions.ee';
if (appConfig.isCloud) {
import('./workers/remove-cancelled-subscriptions.ee');
import('./queues/remove-cancelled-subscriptions.ee');
}
import telemetry from './helpers/telemetry';
telemetry.setServiceType('worker');