tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source 
- `app/views/statuses/_simple_status.html.haml`:
  Small markup change in glitch-soc, on a line that has been modified by
  upstream. Ported upstream changes.
This commit is contained in:
Claire
2021-05-07 18:21:59 +02:00
parent a346912030 d8e0c8a89e
commit 50b430d9a2
483 changed files with 13397 additions and 7694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
streaming/index.js
View File

@@ -99,11 +99,11 @@ const startMaster = () => {
log.warn('UNIX domain socket is now supported by using SOCKET. Please migrate from PORT hack.');
}
log.info(`Starting streaming API server master with ${numWorkers} workers`);
log.warn(`Starting streaming API server master with ${numWorkers} workers`);
};
const startWorker = (workerId) => {
log.info(`Starting worker ${workerId}`);
log.warn(`Starting worker ${workerId}`);
const pgConfigs = {
development: {
@@ -1084,16 +1084,16 @@ const startWorker = (workerId) => {
}
ws.isAlive = false;
ws.ping('', false, true);
ws.ping('', false);
});
}, 30000);
attachServerWithConfig(server, address => {
log.info(`Worker ${workerId} now listening on ${address}`);
log.warn(`Worker ${workerId} now listening on ${address}`);
});
const onExit = () => {
log.info(`Worker ${workerId} exiting, bye bye`);
log.warn(`Worker ${workerId} exiting`);
server.close();
process.exit(0);
};