fix: Run remove cancelled subscriptions only in the cloud
This commit is contained in:
@@ -11,24 +11,32 @@ import appConfig from '../config/app';
|
|||||||
|
|
||||||
const serverAdapter = new ExpressAdapter();
|
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) => {
|
const createBullBoardHandler = async (serverAdapter: ExpressAdapter) => {
|
||||||
if (
|
if (!shouldEnableBullDashboard) return;
|
||||||
!appConfig.enableBullMQDashboard ||
|
|
||||||
!appConfig.bullMQDashboardUsername ||
|
|
||||||
!appConfig.bullMQDashboardPassword
|
|
||||||
)
|
|
||||||
return;
|
|
||||||
|
|
||||||
createBullBoard({
|
createBullBoard({
|
||||||
queues: [
|
queues,
|
||||||
new BullMQAdapter(flowQueue),
|
serverAdapter,
|
||||||
new BullMQAdapter(triggerQueue),
|
|
||||||
new BullMQAdapter(actionQueue),
|
|
||||||
new BullMQAdapter(emailQueue),
|
|
||||||
new BullMQAdapter(deleteUserQueue),
|
|
||||||
new BullMQAdapter(removeCancelledSubscriptionsQueue),
|
|
||||||
],
|
|
||||||
serverAdapter: serverAdapter,
|
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -1,4 +1,5 @@
|
|||||||
import * as Sentry from './helpers/sentry.ee';
|
import * as Sentry from './helpers/sentry.ee';
|
||||||
|
import appConfig from './config/app';
|
||||||
|
|
||||||
Sentry.init();
|
Sentry.init();
|
||||||
|
|
||||||
@@ -9,8 +10,12 @@ import './workers/trigger';
|
|||||||
import './workers/action';
|
import './workers/action';
|
||||||
import './workers/email';
|
import './workers/email';
|
||||||
import './workers/delete-user.ee';
|
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';
|
import telemetry from './helpers/telemetry';
|
||||||
|
|
||||||
telemetry.setServiceType('worker');
|
telemetry.setServiceType('worker');
|
||||||
|
Reference in New Issue
Block a user