Skip to content

Commit

Permalink
Merge branch 'master' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
carmenfan committed Feb 20, 2025
2 parents 7566348 + 65fa8db commit 2f370bd
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion backend/VERSION.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ "VERSION" : "5.14.1",
{ "VERSION" : "5.14.2",
"unity" : {
"current" : "5.20.0",
"supported": []
Expand Down
2 changes: 1 addition & 1 deletion backend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "3drepo.io",
"version": "5.14.1",
"version": "5.14.2",
"engines": {
"node": "18.x.x"
},
Expand Down
8 changes: 8 additions & 0 deletions backend/src/v4/response_codes.js
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,10 @@
*/
responseCodes.respond = function (place, req, res, next, resCode, extraInfo, format, cache, customHeaders) {

// Topology is closed mongo error is typically coming from the session management and the library
// doesn't let us recover from it (so far). So kill this pod and let it respawn.
const killServer = resCode?.name === "MongoError" && resCode?.message?.includes && resCode.message.includes("Topology is closed") ? resCode : false;

resCode = utils.mongoErrorToResCode(resCode);

if (!resCode || valid_values.indexOf(resCode.value) === -1) {
Expand Down Expand Up @@ -490,6 +494,10 @@
// log bandwidth and http status code
systemLogger.logInfo(genResponseLogging(resCode, meta, req), undefined, logLabels.network);
}

if (killServer) {
return Promise.reject(killServer);
}
};

responseCodes.writeStreamRespond = function (place, req, res, next, readStream, customHeaders) {
Expand Down
2 changes: 1 addition & 1 deletion backend/src/v4/routes/apidoc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "5.14.1"
"version": "5.14.2"
}
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "3drepo.io-frontend",
"version": "5.14.1",
"version": "5.14.2",
"description": "The frontend for 3drepo.io",
"engines": {
"node": "18.x.x"
Expand Down

0 comments on commit 2f370bd

Please sign in to comment.