fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-23 22:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing or incorrect cache-control headers for Streaming server (#32551)

Browse source
This commit is contained in:
Emelia Smith 2024-10-17 10:17:18 +02:00 committed by GitHub
parent 5103abc3ec
commit b23ff050ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
streaming/index.js
View file

@ -235,7 +235,7 @@ const startServer = async () => {
app.get('/favicon.ico', (_req, res) => res.status(404).end()); app.get('/favicon.ico', (_req, res) => res.status(404).end());
app.get('/api/v1/streaming/health', (_req, res) => { app.get('/api/v1/streaming/health', (_req, res) => {
res.writeHead(200, { 'Content-Type': 'text/plain' }); res.writeHead(200, { 'Content-Type': 'text/plain', 'Cache-Control': 'private, no-store' });
res.end('OK'); res.end('OK');
}); });
@ -858,7 +858,7 @@ const startServer = async () => {
} }
res.setHeader('Content-Type', 'text/event-stream'); res.setHeader('Content-Type', 'text/event-stream');
res.setHeader('Cache-Control', 'no-store'); res.setHeader('Cache-Control', 'private, no-store');
res.setHeader('Transfer-Encoding', 'chunked'); res.setHeader('Transfer-Encoding', 'chunked');
res.write(':)\n'); res.write(':)\n');

2
streaming/metrics.js
View file

@ -98,9 +98,11 @@ export function setupMetrics(channels, pgPool) {
const requestHandler = (req, res) => { const requestHandler = (req, res) => {
metrics.register.metrics().then((output) => { metrics.register.metrics().then((output) => {
res.set('Content-Type', metrics.register.contentType); res.set('Content-Type', metrics.register.contentType);
res.set('Cache-Control', 'private, no-store');
res.end(output); res.end(output);
}).catch((err) => { }).catch((err) => {
req.log.error(err, "Error collecting metrics"); req.log.error(err, "Error collecting metrics");
res.set('Cache-Control', 'private, no-store');
res.status(500).end(); res.status(500).end();
}); });
}; };