gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Support listening on the unix socket
This commit is contained in:
zadam 2023-03-12 21:31:37 +01:00 committed by GitHub
commit 4f63284d41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docker_healthcheck.js
View File

@ -10,18 +10,27 @@ if (config.https) {
const port = require('./src/services/port'); const port = require('./src/services/port');
const host = require('./src/services/host'); const host = require('./src/services/host');
const url = `http://${host}:${port}/api/health-check`;
const options = { timeout: 2000 }; let options = {timeout: 2000};
const request = http.request(url, options, res => { const callback = res => {
console.log(`STATUS: ${res.statusCode}`); console.log(`STATUS: ${res.statusCode}`);
if (res.statusCode === 200) { if (res.statusCode === 200) {
process.exit(0); process.exit(0);
} else { } else {
process.exit(1); process.exit(1);
} }
}); };
let request;
if (port !== 0) { // TCP socket.
const url = `http://${host}:${port}/api/health-check`;
request = http.request(url, options, callback);
} else { // Unix socket.
options.socketPath = host;
options.path = '/api/health-check';
request = http.request(options, callback);
}
request.on("error", err => { request.on("error", err => {
console.log("ERROR"); console.log("ERROR");
process.exit(1); process.exit(1);
}); });
request.end(); request.end();

2
src/services/port.js
View File

@ -6,7 +6,7 @@ const dataDir = require('./data_dir');
function parseAndValidate(portStr, source) { function parseAndValidate(portStr, source) {
const portNum = parseInt(portStr); 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.`); console.log(`FATAL ERROR: Invalid port value "${portStr}" from ${source}, should be a number between 0 and 65536.`);
process.exit(-1); process.exit(-1);
} }

17
src/www
View File

@ -100,9 +100,14 @@ async function startTrilium() {
*/ */
httpServer.keepAliveTimeout = 120000 * 5; 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 => { httpServer.on('error', error => {
if (error.syscall !== 'listen') { if (!listenTcp || error.syscall !== 'listen') {
throw error; 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); ws.init(httpServer, sessionParser);