gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'parent/stable-4.3' into kb-draft-15.4-lts

Browse source
This commit is contained in:
KMY 2024-10-21 20:07:10 +09:00
commit fbd8709c65
271 changed files with 2107 additions and 1174 deletions
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('/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');
});
@ -918,7 +918,7 @@ const startServer = async () => {
}
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.write(':)\n');

2
streaming/metrics.js
View file

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

6
streaming/redis.js
View file

@ -50,9 +50,9 @@ function getSentinelConfiguration(env, commonOptions) {
return {
db: redisDatabase,
name: env.REDIS_SENTINEL_MASTER,
username: env.REDIS_USERNAME,
username: env.REDIS_USER,
password: env.REDIS_PASSWORD,
sentinelUsername: env.REDIS_SENTINEL_USERNAME ?? env.REDIS_USERNAME,
sentinelUsername: env.REDIS_SENTINEL_USERNAME ?? env.REDIS_USER,
sentinelPassword: env.REDIS_SENTINEL_PASSWORD ?? env.REDIS_PASSWORD,
sentinels,
...commonOptions,
@ -104,7 +104,7 @@ export function configFromEnv(env) {
host: env.REDIS_HOST ?? '127.0.0.1',
port: redisPort,
db: redisDatabase,
username: env.REDIS_USERNAME,
username: env.REDIS_USER,
password: env.REDIS_PASSWORD,
...commonOptions,
};