Merge pull request #19847 from overleaf/jpa-rename-history-v1
[misc] rename docker compose service history_v1 to history-v1 in dev-env GitOrigin-RevId: 0991ee4297bae1ed9e9068af1889966ceeeba66d
This commit is contained in:
@@ -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
|
||||||
|
|||||||
@@ -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),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -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({
|
||||||
|
|||||||
Reference in New Issue
Block a user