github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-22 21:33:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13298 from overleaf/msm-hotfix-3_5_7

Browse source 
CE/SP Hotfix 3.5.7

GitOrigin-RevId: 4f530530cd351c2780b86caba00cb9f7516253d1
This commit is contained in:
Miguel Serrano 2023-06-01 11:42:14 +02:00 committed by Copybot
parent ae35d880ee
commit 9e154d0857
2 changed files with 45 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
server-ce/hotfix/3.5.7/Dockerfile Normal file
View file

@ -0,0 +1,5 @@
FROM sharelatex/sharelatex:3.5.6
# Patch: clean up history id on `migrate_history.js --force-clean`
COPY force_clean_fix.patch .
RUN patch -p0 < force_clean_fix.patch

40
server-ce/hotfix/3.5.7/force_clean_fix.patch Normal file
View file

@ -0,0 +1,40 @@
--- services/web/modules/history-migration/app/src/HistoryUpgradeHelper.js
+++ services/web/modules/history-migration/app/src/HistoryUpgradeHelper.js
@@ -115,6 +115,11 @@ async function upgradeProject(project, options) {
const projectId = project._id
// delete any existing history stored in the mongo backend
await HistoryManager.promises.deleteProject(projectId, projectId)
+ // unset overleaf.history.id to prevent the migration script from failing on checks
+ await db.projects.updateOne(
+ { _id: projectId },
+ { $unset: { 'overleaf.history.id': '' } }
+ )
} catch (err) {
// failed to delete existing history, but we can try to continue
}
--- services/web/scripts/history/migrate_history.js
+++ services/web/scripts/history/migrate_history.js
@@ -147,7 +147,7 @@ async function migrateProjects(projectsToMigrate) {
}
// send log output for each migration to a file
const output = fs.createWriteStream(argv.output, { flags: 'a' })
- console.log(`Writing log output to ${argv.output}`)
+ console.log(`Writing log output to ${process.cwd()}/${argv.output}`)
const logger = new console.Console({ stdout: output })
function logJson(obj) {
logger.log(JSON.stringify(obj))
@@ -253,8 +253,12 @@ async function main() {
console.log('Projects migrated: ', projectsMigrated)
console.log('Projects failed: ', projectsFailed)
if (projectsFailed > 0) {
- console.log(`Log output written to ${argv.output}`)
- console.log('Please check the log for errors.')
+ console.log('------------------------------------------------------')
+ console.log(`Log output written to ${process.cwd()}/${argv.output}`)
+ console.log(
+ 'Please check the log for errors. Attach the content of the file when contacting support.'
+ )
+ console.log('------------------------------------------------------')
}
if (INTERRUPT) {
console.log('Migration interrupted, please run again to continue.')