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 #19847 from overleaf/jpa-rename-history-v1

Browse source 
[misc] rename docker compose service history_v1 to history-v1 in dev-env

GitOrigin-RevId: 0991ee4297bae1ed9e9068af1889966ceeeba66d
This commit is contained in:
Jakob Ackermann 2024-08-08 12:40:20 +02:00 committed by Copybot
parent a16db120c0
commit 86f26043d2
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/project-history/app/js/HistoryStoreManager.js
View file

@ -18,7 +18,7 @@ import * as LocalFileWriter from './LocalFileWriter.js'
import * as HashManager from './HashManager.js' import * as HashManager from './HashManager.js'
import * as HistoryBlobTranslator from './HistoryBlobTranslator.js' import * as HistoryBlobTranslator from './HistoryBlobTranslator.js'
const HTTP_REQUEST_TIMEOUT = Settings.apis.history_v1.requestTimeout const HTTP_REQUEST_TIMEOUT = Settings.overleaf.history.requestTimeout
/** /**
* Container for functions that need to be mocked in tests * Container for functions that need to be mocked in tests

4
services/project-history/config/settings.defaults.cjs
View file

@ -23,9 +23,6 @@ module.exports = {
filestore: { filestore: {
url: `http://${process.env.FILESTORE_HOST || '127.0.0.1'}:3009`, url: `http://${process.env.FILESTORE_HOST || '127.0.0.1'}:3009`,
}, },
history_v1: {
requestTimeout: parseInt(process.env.V1_REQUEST_TIMEOUT || '300000', 10),
},
web: { web: {
url: `http://${ url: `http://${
process.env.WEB_API_HOST || process.env.WEB_HOST || '127.0.0.1' process.env.WEB_API_HOST || process.env.WEB_HOST || '127.0.0.1'
@ -90,6 +87,7 @@ module.exports = {
retries_max: 30, retries_max: 30,
interval: 2, interval: 2,
}, },
requestTimeout: parseInt(process.env.V1_REQUEST_TIMEOUT || '300000', 10),
}, },
}, },

2
services/project-history/test/unit/js/HistoryStoreManager/HistoryStoreManagerTests.js
View file

@ -17,13 +17,13 @@ describe('HistoryStoreManager', function () {
host: 'http://example.com', host: 'http://example.com',
user: 'overleaf', user: 'overleaf',
pass: 'password', pass: 'password',
requestTimeout: 123,
}, },
}, },
apis: { apis: {
filestore: { filestore: {
url: 'http://filestore.overleaf.production', url: 'http://filestore.overleaf.production',
}, },
history_v1: { requestTimeout: 123 },
}, },
} }
this.latestChunkRequestArgs = sinon.match({ this.latestChunkRequestArgs = sinon.match({