sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

実行時にpackage.jsonを参照しないように (#5418)

Browse Source 
* 実行時にpackage.jsonを参照しないように

* nodeinfo

* move meta.json

* add dummy

* lowercase
This commit is contained in:
MeiMei
2019-11-01 22:34:26 +09:00
committed by syuilo
parent 5b0dfa6130
commit 92af4401e2
10 changed files with 43 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/boot/master.ts
View File

@ -8,7 +8,6 @@ import Logger from '../services/logger';
import loadConfig from '../config/load';
import { Config } from '../config/types';
import { lessThan } from '../prelude/array';
import * as pkg from '../../package.json';
import { program } from '../argv';
import { showMachineInfo } from '../misc/show-machine-info';
import { initDb } from '../db/postgre';
@ -16,10 +15,10 @@ import { initDb } from '../db/postgre';
const logger = new Logger('core', 'cyan');
const bootLogger = logger.createSubLogger('boot', 'magenta', false);
function greet() {
function greet(config: Config) {
if (!program.quiet) {
//#region Misskey logo
const v = `v${pkg.version}`;
const v = `v${config.version}`;
console.log(' _____ _ _ ');
console.log(' | |_|___ ___| |_ ___ _ _ ');
console.log(' | | | | |_ -|_ -| \'_| -_| | |');
@ -35,21 +34,21 @@ function greet() {
}
bootLogger.info('Welcome to Misskey!');
bootLogger.info(`Misskey v${pkg.version}`, null, true);
bootLogger.info(`Misskey v${config.version}`, null, true);
}
/**
* Init master process
*/
export async function masterMain() {
greet();
let config!: Config;
try {
// initialize app
config = await init();
greet(config);
if (config.port == null || Number.isNaN(config.port)) {
bootLogger.error('The port is not configured. Please configure port.', null, true);
process.exit(1);