Merge pull request #3699 from new-sashok724/unix-sockets

Support listening on the unix socket
This commit is contained in:
zadam
2023-03-12 21:31:37 +01:00
committed by GitHub
3 changed files with 29 additions and 9 deletions
+1 -1
View File
@@ -6,7 +6,7 @@ const dataDir = require('./data_dir');
function parseAndValidate(portStr, source) {
const portNum = parseInt(portStr);
if (!portNum || portNum < 0 || portNum >= 65536) {
if (!portNum && portNum !== 0 || portNum < 0 || portNum >= 65536) {
console.log(`FATAL ERROR: Invalid port value "${portStr}" from ${source}, should be a number between 0 and 65536.`);
process.exit(-1);
}
+14 -3
View File
@@ -100,9 +100,14 @@ async function startTrilium() {
*/
httpServer.keepAliveTimeout = 120000 * 5;
httpServer.listen(port, host);
const listenTcp = port !== 0;
if (listenTcp) {
httpServer.listen(port, host); // TCP socket.
} else {
httpServer.listen(host); // Unix socket.
}
httpServer.on('error', error => {
if (error.syscall !== 'listen') {
if (!listenTcp || error.syscall !== 'listen') {
throw error;
}
@@ -124,7 +129,13 @@ async function startTrilium() {
}
)
httpServer.on('listening', () => log.info(`Listening on port ${httpServer.address().port}`));
httpServer.on('listening', () => {
if (listenTcp) {
log.info(`Listening on port ${port}`)
} else {
log.info(`Listening on unix socket ${host}`)
}
});
ws.init(httpServer, sessionParser);