github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #20348 from overleaf/jpa-disable-bull-pro

Browse source 
[web] provide stub interface for bull queues in Server Pro/CE

GitOrigin-RevId: 014cf1a87c266fd760ff3c2bd493689bbf16e637
This commit is contained in:
Jakob Ackermann 2024-09-25 12:07:19 +02:00 committed by Copybot
parent 88196f8e38
commit e61b157666
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
services/web/app/src/infrastructure/Queues.js
View file

@ -1,5 +1,6 @@
const Queue = require('bull') const Queue = require('bull')
const Settings = require('@overleaf/settings') const Settings = require('@overleaf/settings')
const Features = require('../infrastructure/Features')
const { addConnectionDrainer } = require('./GracefulShutdown') const { addConnectionDrainer } = require('./GracefulShutdown')
// Bull will keep a fixed number of the most recently completed jobs. This is // Bull will keep a fixed number of the most recently completed jobs. This is
@ -62,6 +63,14 @@ const ANALYTICS_QUEUES = [
const queues = {} const queues = {}
function getQueue(queueName) { function getQueue(queueName) {
if (!Features.hasFeature('saas')) {
// Disable bull queue handling for Server Pro/CE by providing a stub interface.
return {
async add() {},
process() {},
}
}
if (!queues[queueName]) { if (!queues[queueName]) {
const redisOptions = ANALYTICS_QUEUES.includes(queueName) const redisOptions = ANALYTICS_QUEUES.includes(queueName)
? Settings.redis.analyticsQueues ? Settings.redis.analyticsQueues

6
services/web/test/unit/src/Subscription/FeaturesUpdaterTests.js
View file

@ -98,6 +98,11 @@ describe('FeaturesUpdater', function () {
this.Modules = { this.Modules = {
promises: { hooks: { fire: sinon.stub().resolves() } }, promises: { hooks: { fire: sinon.stub().resolves() } },
} }
this.Queues = {
getQueue: sinon.stub().returns({
add: sinon.stub().resolves(),
}),
}
this.FeaturesUpdater = SandboxedModule.require(MODULE_PATH, { this.FeaturesUpdater = SandboxedModule.require(MODULE_PATH, {
requires: { requires: {
@ -110,6 +115,7 @@ describe('FeaturesUpdater', function () {
'../User/UserGetter': this.UserGetter, '../User/UserGetter': this.UserGetter,
'../Analytics/AnalyticsManager': this.AnalyticsManager, '../Analytics/AnalyticsManager': this.AnalyticsManager,
'../../infrastructure/Modules': this.Modules, '../../infrastructure/Modules': this.Modules,
'../../infrastructure/Queues': this.Queues,
}, },
}) })
}) })