From d70937e0dafa33db57727166ead9005e838dbb57 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Wed, 25 Aug 2021 10:25:21 +0200 Subject: [PATCH] Merge pull request #4837 from overleaf/tm-cdn-load-error-reporting Move CDN load test to separate file and report error to sentry GitOrigin-RevId: 5870fae9939a62848d3a39899a1da3608935988b --- services/web/app/views/layout.pug | 8 +------- services/web/frontend/js/cdn-load-test.js | 7 +++++++ services/web/webpack.config.js | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 services/web/frontend/js/cdn-load-test.js diff --git a/services/web/app/views/layout.pug b/services/web/app/views/layout.pug index 3b602f385b..efb4b9544f 100644 --- a/services/web/app/views/layout.pug +++ b/services/web/app/views/layout.pug @@ -134,10 +134,4 @@ html( window.location.search += "&nocdn=true"; } if hasFeature('saas') - script(type="text/javascript", nonce=scriptNonce). - //- Test for CDN availability and report to sentry if loading failed - var cdnLoadTest = document.createElement('img') - cdnLoadTest.addEventListener('error', function () { - throw new Error('CDN test image load error (cdn.overleaf.net)') - }) - cdnLoadTest.src = 'https://cdn.overleaf.net/img/1p.gif' + script(type="text/javascript", nonce=scriptNonce, src=buildJsPath('cdn-load-test.js')) diff --git a/services/web/frontend/js/cdn-load-test.js b/services/web/frontend/js/cdn-load-test.js new file mode 100644 index 0000000000..dcb2e980b0 --- /dev/null +++ b/services/web/frontend/js/cdn-load-test.js @@ -0,0 +1,7 @@ +import { captureMessage } from './infrastructure/error-reporter' + +var cdnLoadTest = document.createElement('img') +cdnLoadTest.addEventListener('error', function (event) { + captureMessage('CDN test image load error (cdn.overleaf.net)') +}) +cdnLoadTest.src = 'https://cdn.overleaf.net/img/1p.gif' diff --git a/services/web/webpack.config.js b/services/web/webpack.config.js index 3393e0489d..21f410f9e9 100644 --- a/services/web/webpack.config.js +++ b/services/web/webpack.config.js @@ -14,6 +14,7 @@ const entryPoints = { serviceWorker: './frontend/js/serviceWorker.js', main: './frontend/js/main.js', ide: './frontend/js/ide.js', + 'cdn-load-test': './frontend/js/cdn-load-test.js', style: './frontend/stylesheets/style.less', 'ieee-style': './frontend/stylesheets/ieee-style.less', 'light-style': './frontend/stylesheets/light-style.less',