Page MenuHomePhorge
Files F33481633

D13168.1769044167.diff
No OneTemporary
Actions

Size
1 KB
Referenced Files
None
Subscribers
None

D13168.1769044167.diff
View Options

diff --git a/keyserver/src/keyserver.js b/keyserver/src/keyserver.js
--- a/keyserver/src/keyserver.js
+++ b/keyserver/src/keyserver.js
@@ -17,7 +17,10 @@
import { identityDeviceTypes } from 'lib/types/identity-service-types.js';
import { isDev } from 'lib/utils/dev-utils.js';
import { ignorePromiseRejections } from 'lib/utils/promises.js';
+import sleep from 'lib/utils/sleep.js';
+import { fetchDBVersion } from './database/db-version.js';
+import { newDatabaseVersion } from './database/migration-config.js';
import { migrate } from './database/migrations.js';
import { jsonEndpoints } from './endpoints.js';
import { logEndpointMetrics } from './middleware/endpoint-profiling.js';
@@ -192,6 +195,27 @@
res.send('OK');
});
+ const listenAddress = (() => {
+ if (process.env.COMM_LISTEN_ADDR) {
+ return process.env.COMM_LISTEN_ADDR;
+ } else if (process.env.NODE_ENV === 'development') {
+ return undefined;
+ } else {
+ return 'localhost';
+ }
+ })();
+
+ server.listen(parseInt(process.env.PORT, 10) || 3000, listenAddress);
+
+ if (isSecondaryNode) {
+ let dbVersion = await fetchDBVersion();
+ while (dbVersion < newDatabaseVersion) {
+ await sleep(10000);
+
+ dbVersion = await fetchDBVersion();
+ }
+ }
+
// Note - the order of router declarations matters. On prod we have
// keyserverBaseRoutePath configured to '/', which means it's a catch-all.
// If we call server.use on keyserverRouter first, it will catch all
@@ -316,17 +340,5 @@
res.redirect(newURL);
});
}
-
- const listenAddress = (() => {
- if (process.env.COMM_LISTEN_ADDR) {
- return process.env.COMM_LISTEN_ADDR;
- } else if (process.env.NODE_ENV === 'development') {
- return undefined;
- } else {
- return 'localhost';
- }
- })();
-
- server.listen(parseInt(process.env.PORT, 10) || 3000, listenAddress);
}
})();

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 22, 1:09 AM (4 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5972934
Default Alt Text
D13168.1769044167.diff (1 KB)

Event Timeline