github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-01 18:13:53 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #15793 from overleaf/jpa-compile-domain-cleanup

Browse source 
[web] tear down split test for new compile domain

GitOrigin-RevId: 7ab417d67e508cd95bd4e78ce7ce2a993c789dca
This commit is contained in:
Jakob Ackermann 2023-11-16 12:55:24 +01:00 committed by Copybot
parent 2cc84488a8
commit 453edbfe0a
3 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
services/web/app/src/Features/Compile/CompileController.js
View file

@ -57,16 +57,7 @@ const getSplitTestOptions = callbackify(async function (req, res) {
} catch (e) {} } catch (e) {}
const editorReq = { ...req, query } const editorReq = { ...req, query }
const { variant: domainVariant } = const pdfDownloadDomain = Settings.pdfDownloadDomain
await SplitTestHandler.promises.getAssignment(
editorReq,
res,
'pdf-download-domain'
)
const pdfDownloadDomain =
domainVariant === 'user' && Settings.compilesUserContentDomain
? Settings.compilesUserContentDomain
: Settings.pdfDownloadDomain
if (!req.query.enable_pdf_caching) { if (!req.query.enable_pdf_caching) {
// The frontend does not want to do pdf caching. // The frontend does not want to do pdf caching.

1
services/web/app/views/project/editor/meta.pug
View file

@ -13,7 +13,6 @@ meta(name="ol-wikiEnabled" data-type="boolean" content=settings.proxyLearn)
meta(name="ol-gitBridgePublicBaseUrl" content=gitBridgePublicBaseUrl) meta(name="ol-gitBridgePublicBaseUrl" content=gitBridgePublicBaseUrl)
meta(name="ol-gitBridgeEnabled" data-type="boolean" content=gitBridgeEnabled) meta(name="ol-gitBridgeEnabled" data-type="boolean" content=gitBridgeEnabled)
meta(name="ol-compilesUserContentDomain" content=settings.compilesUserContentDomain) meta(name="ol-compilesUserContentDomain" content=settings.compilesUserContentDomain)
meta(name="ol-fallbackCompileDomain" content=settings.pdfDownloadDomain)
//- Set base path for Ace scripts loaded on demand/workers and don't use cdn //- Set base path for Ace scripts loaded on demand/workers and don't use cdn
meta(name="ol-aceBasePath" content="/js/" + lib('ace')) meta(name="ol-aceBasePath" content="/js/" + lib('ace'))
//- enable doc hash checking for all projects //- enable doc hash checking for all projects

3
services/web/config/settings.defaults.js
View file

@ -586,8 +586,7 @@ module.exports = {
// disablePerUserCompiles: true // disablePerUserCompiles: true
// Domain the client (pdfjs) should download the compiled pdf from // Domain the client (pdfjs) should download the compiled pdf from
pdfDownloadDomain: process.env.PDF_DOWNLOAD_DOMAIN, // "http://clsi-lb:3014" pdfDownloadDomain: process.env.COMPILES_USER_CONTENT_DOMAIN, // "http://clsi-lb:3014"
compilesUserContentDomain: process.env.COMPILES_USER_CONTENT_DOMAIN,
// By default turn on feature flag, can be overridden per request. // By default turn on feature flag, can be overridden per request.
enablePdfCaching: process.env.ENABLE_PDF_CACHING === 'true', enablePdfCaching: process.env.ENABLE_PDF_CACHING === 'true',