summaryrefslogtreecommitdiff
path: root/packages/backend/src
diff options
context:
space:
mode:
authorledlamp <lamp@owo69.me>2023-02-22 00:51:40 -0800
committerGitHub <noreply@github.com>2023-02-22 17:51:40 +0900
commit3dfe3aa9a48cba0570508ef037c5289894fa731b (patch)
treefd0acc34a37e8730097225bad7141d9fb1abf92e /packages/backend/src
parentNew Crowdin updates (#9897) (diff)
downloadmisskey-3dfe3aa9a48cba0570508ef037c5289894fa731b.tar.gz
misskey-3dfe3aa9a48cba0570508ef037c5289894fa731b.tar.bz2
misskey-3dfe3aa9a48cba0570508ef037c5289894fa731b.zip
Allow configuring the listen host (#9924)
Diffstat (limited to 'packages/backend/src')
-rw-r--r--packages/backend/src/boot/master.ts2
-rw-r--r--packages/backend/src/config.ts2
-rw-r--r--packages/backend/src/server/ServerService.ts6
3 files changed, 6 insertions, 4 deletions
diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts
index f5d936fadf..008f9ec587 100644
--- a/packages/backend/src/boot/master.ts
+++ b/packages/backend/src/boot/master.ts
@@ -78,7 +78,7 @@ export async function masterMain() {
await spawnWorkers(config.clusterLimit);
}
- bootLogger.succ(`Now listening on port ${config.port} on ${config.url}`, null, true);
+ bootLogger.succ(`Now listening on ${config.host ? `[${config.host}]:` : ''}${config.port} for ${config.url}`, null, true);
}
function showEnvironment(): void {
diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index 73f45e92e1..0572002239 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -15,6 +15,7 @@ export type Source = {
feedback_url?: string;
url: string;
port: number;
+ host: string;
disableHsts?: boolean;
db: {
host: string;
@@ -125,6 +126,7 @@ export function loadConfig() {
config.url = url.origin;
config.port = config.port ?? parseInt(process.env.PORT ?? '', 10);
+ config.host = config.host ?? process.env.HOST;
mixin.version = meta.version;
mixin.host = url.host;
diff --git a/packages/backend/src/server/ServerService.ts b/packages/backend/src/server/ServerService.ts
index 8200b24fd4..9ae4cf4db6 100644
--- a/packages/backend/src/server/ServerService.ts
+++ b/packages/backend/src/server/ServerService.ts
@@ -176,10 +176,10 @@ export class ServerService {
fastify.server.on('error', err => {
switch ((err as any).code) {
case 'EACCES':
- this.logger.error(`You do not have permission to listen on port ${this.config.port}.`);
+ this.logger.error(`You do not have permission to listen on port ${this.config.port}${this.config.host ? ` of host ${this.config.host}` : ''}`);
break;
case 'EADDRINUSE':
- this.logger.error(`Port ${this.config.port} is already in use by another process.`);
+ this.logger.error(`Port ${this.config.port}${this.config.host ? ` on ${this.config.host}` : ''} is already in use by another process.`);
break;
default:
this.logger.error(err);
@@ -194,6 +194,6 @@ export class ServerService {
}
});
- fastify.listen({ port: this.config.port, host: '0.0.0.0' });
+ fastify.listen({ port: this.config.port, host: this.config.host });
}
}