profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

server: コマンドラインオプション廃止

Browse source 
Resolve #7863
Resolve #6337
This commit is contained in:
syuilo 2021-10-08 21:24:05 +09:00
parent 129f652dc2
commit a38e4b0b14
11 changed files with 40 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/boot/index.ts
View file

@ -3,7 +3,7 @@ import * as chalk from 'chalk';
import Xev from 'xev';
import Logger from '@/services/logger';
import { program } from '../argv';
import { envOption } from '../env';
// for typeorm
import 'reflect-metadata';
@ -20,7 +20,7 @@ const ev = new Xev();
export default async function() {
process.title = `Misskey (${cluster.isMaster ? 'master' : 'worker'})`;
if (cluster.isMaster || program.disableClustering) {
if (cluster.isMaster || envOption.disableClustering) {
await masterMain();
if (cluster.isMaster) {
@ -28,7 +28,7 @@ export default async function() {
}
}
if (cluster.isWorker || program.disableClustering) {
if (cluster.isWorker || envOption.disableClustering) {
await workerMain();
}
@ -60,7 +60,7 @@ cluster.on('exit', worker => {
});
// Display detail of unhandled promise rejection
if (!program.quiet) {
if (!envOption.quiet) {
process.on('unhandledRejection', console.dir);
}

8
src/boot/master.ts
View file

@ -11,7 +11,7 @@ import Logger from '@/services/logger';
import loadConfig from '@/config/load';
import { Config } from '@/config/types';
import { lessThan } from '@/prelude/array';
import { program } from '../argv';
import { envOption } from '../env';
import { showMachineInfo } from '@/misc/show-machine-info';
import { initDb } from '../db/postgre';
@ -25,7 +25,7 @@ const logger = new Logger('core', 'cyan');
const bootLogger = logger.createSubLogger('boot', 'magenta', false);
function greet() {
if (!program.quiet) {
if (!envOption.quiet) {
//#region Misskey logo
const v = `v${meta.version}`;
console.log(' _____ _ _ ');
@ -73,13 +73,13 @@ export async function masterMain() {
bootLogger.succ('Misskey initialized');
if (!program.disableClustering) {
if (!envOption.disableClustering) {
await spawnWorkers(config.clusterLimit);
}
bootLogger.succ(`Now listening on port ${config.port} on ${config.url}`, null, true);
if (!program.noDaemons) {
if (!envOption.noDaemons) {
require('../daemons/server-stats').default();
require('../daemons/queue-stats').default();
require('../daemons/janitor').default();