Просмотр исходного кода

Merge pull request #15588 from overleaf/em-migrations-mongo-timeout

Disable socket timeout when running Mongo migrations

GitOrigin-RevId: 4fd1b9d4b4756951fce3918a01e1c8803538153d
Eric Mc Sween 2 лет назад
Родитель
Сommit
08304b5947
2 измененных файлов с 6 добавлено и 2 удалено
  1. 5 1
      services/web/config/settings.defaults.js
  2. 1 1
      services/web/package.json

+ 5 - 1
services/web/config/settings.defaults.js

@@ -116,7 +116,11 @@ module.exports = {
       maxPoolSize: parseInt(process.env.MONGO_POOL_SIZE, 10) || 100,
       serverSelectionTimeoutMS:
         parseInt(process.env.MONGO_SERVER_SELECTION_TIMEOUT, 10) || 60000,
-      socketTimeoutMS: parseInt(process.env.MONGO_SOCKET_TIMEOUT, 10) || 60000,
+      // Setting socketTimeoutMS to 0 means no timeout
+      socketTimeoutMS: parseInt(
+        process.env.MONGO_SOCKET_TIMEOUT ?? '60000',
+        10
+      ),
     },
     url:
       process.env.MONGO_CONNECTION_STRING ||

+ 1 - 1
services/web/package.json

@@ -28,7 +28,7 @@
     "lint:fix": "eslint --fix --ext .js,.jsx,.mjs,.ts,.tsx .",
     "type-check": "tsc --noEmit",
     "extract-translations": "i18next-scanner",
-    "migrations": "east",
+    "migrations": "MONGO_SOCKET_TIMEOUT=0 east",
     "convert-themes": "node frontend/js/features/source-editor/themes/scripts/convert.js",
     "cypress:open-ct": "SHARELATEX_CONFIG=$PWD/config/settings.webpack.js cypress open --component",
     "cypress:run-ct": "SHARELATEX_CONFIG=$PWD/config/settings.webpack.js cypress run --component --browser chrome",