Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 5.3.5 #27437

Merged
merged 2 commits into from
Dec 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .github/history.json
Original file line number Diff line number Diff line change
Expand Up @@ -95734,6 +95734,26 @@
]
}
]
},
"5.3.5": {
"node_version": "14.19.3",
"npm_version": "6.14.17",
"mongo_versions": [
"4.2",
"4.4",
"5.0"
],
"pull_requests": [
{
"pr": "27435",
"title": "[FIX] Fix watch db being started on Micro Services env",
"userLogin": "ggazzo",
"milestone": "5.4.0",
"contributors": [
"ggazzo"
]
}
]
}
}
}
19 changes: 18 additions & 1 deletion HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@

# 5.3.5
`2022-12-02 · 1 🐛 · 1 👩‍💻👨‍💻`

### Engine versions
- Node: `14.19.3`
- NPM: `6.14.17`
- MongoDB: `4.2, 4.4, 5.0`

### 🐛 Bug fixes


- Fix watch db being started on Micro Services env ([#27435](https://github.com/RocketChat/Rocket.Chat/pull/27435))

### 👩‍💻👨‍💻 Core Team 🤓

- [@ggazzo](https://github.com/ggazzo)

# 5.3.4
`2022-11-28 · 1 🐛 · 1 🔍 · 2 👩‍💻👨‍💻`
`2022-11-29 · 1 🐛 · 1 🔍 · 2 👩‍💻👨‍💻`

### Engine versions
- Node: `14.19.3`
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/.docker/Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.access.redhat.com/ubi8/nodejs-12

ENV RC_VERSION 5.3.4
ENV RC_VERSION 5.3.5

MAINTAINER buildmaster@rocket.chat

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/utils/rocketchat.info
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "5.3.4"
"version": "5.3.5"
}
2 changes: 1 addition & 1 deletion apps/meteor/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@rocket.chat/meteor",
"description": "The Ultimate Open Source WebChat Platform",
"version": "5.3.4",
"version": "5.3.5",
"private": true,
"author": {
"name": "Rocket.Chat",
Expand Down
16 changes: 10 additions & 6 deletions apps/meteor/server/routes/health.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
import { WebApp } from 'meteor/webapp';

import { isLastDocDelayed } from '../startup/watchDb';
import { isRunningMs } from '../lib/isRunningMs';

WebApp.rawConnectHandlers.use('/health', function (_req, res) {
WebApp.rawConnectHandlers.use('/health', async function (_req, res) {
res.setHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
res.setHeader('Pragma', 'no-cache');
res.setHeader('Expires', 0);
res.setHeader('Content-Type', 'text/plain');

if (isLastDocDelayed()) {
res.writeHead(500);
res.end('not healthy');
return;
if (!isRunningMs()) {
const { isLastDocDelayed } = await import('../startup/watchDb');

if (isLastDocDelayed()) {
res.writeHead(500);
res.end('not healthy');
return;
}
}

res.end('ok');
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rocket.chat",
"version": "5.3.4",
"version": "5.3.5",
"description": "Rocket.Chat Monorepo",
"main": "index.js",
"private": true,
Expand Down