mirror of
https://github.com/misskey-dev/misskey
synced 2024-08-28 20:51:11 +02:00
Fix port cehcking
This commit is contained in:
parent
bd805f1d88
commit
aec7d53414
4585
package-lock.json
generated
4585
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -66,6 +66,7 @@
|
||||||
"@types/ms": "0.7.30",
|
"@types/ms": "0.7.30",
|
||||||
"@types/node": "10.5.2",
|
"@types/node": "10.5.2",
|
||||||
"@types/parse5": "5.0.0",
|
"@types/parse5": "5.0.0",
|
||||||
|
"@types/portscanner": "2.1.0",
|
||||||
"@types/pug": "2.0.4",
|
"@types/pug": "2.0.4",
|
||||||
"@types/qrcode": "1.2.0",
|
"@types/qrcode": "1.2.0",
|
||||||
"@types/ratelimiter": "2.1.28",
|
"@types/ratelimiter": "2.1.28",
|
||||||
|
@ -160,6 +161,7 @@
|
||||||
"on-build-webpack": "0.1.0",
|
"on-build-webpack": "0.1.0",
|
||||||
"os-utils": "0.0.14",
|
"os-utils": "0.0.14",
|
||||||
"parse5": "5.0.0",
|
"parse5": "5.0.0",
|
||||||
|
"portscanner": "2.2.0",
|
||||||
"progress-bar-webpack-plugin": "1.11.0",
|
"progress-bar-webpack-plugin": "1.11.0",
|
||||||
"prominence": "0.2.0",
|
"prominence": "0.2.0",
|
||||||
"promise-sequential": "1.1.1",
|
"promise-sequential": "1.1.1",
|
||||||
|
@ -185,7 +187,6 @@
|
||||||
"summaly": "2.0.6",
|
"summaly": "2.0.6",
|
||||||
"swagger-jsdoc": "1.9.7",
|
"swagger-jsdoc": "1.9.7",
|
||||||
"syuilo-password-strength": "0.0.1",
|
"syuilo-password-strength": "0.0.1",
|
||||||
"tcp-port-used": "0.1.2",
|
|
||||||
"textarea-caret": "3.1.0",
|
"textarea-caret": "3.1.0",
|
||||||
"tmp": "0.0.33",
|
"tmp": "0.0.33",
|
||||||
"ts-loader": "4.4.1",
|
"ts-loader": "4.4.1",
|
||||||
|
|
|
@ -8,7 +8,7 @@ import * as os from 'os';
|
||||||
import * as cluster from 'cluster';
|
import * as cluster from 'cluster';
|
||||||
import * as debug from 'debug';
|
import * as debug from 'debug';
|
||||||
import chalk from 'chalk';
|
import chalk from 'chalk';
|
||||||
// import portUsed = require('tcp-port-used');
|
import * as portscanner from 'portscanner';
|
||||||
import isRoot = require('is-root');
|
import isRoot = require('is-root');
|
||||||
import Xev from 'xev';
|
import Xev from 'xev';
|
||||||
|
|
||||||
|
@ -125,12 +125,9 @@ async function init(): Promise<Config> {
|
||||||
throw 'You need root privileges to listen on port below 1024 on Linux';
|
throw 'You need root privileges to listen on port below 1024 on Linux';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if a port is being used
|
if (await portscanner.checkPortStatus(config.port, '127.0.0.1') === 'open') {
|
||||||
/* https://github.com/stdarg/tcp-port-used/issues/3
|
throw `Port ${config.port} is already in use`;
|
||||||
if (await portUsed.check(config.port)) {
|
|
||||||
throw `Port ${config.port} is already used`;
|
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
|
|
||||||
// Try to connect to MongoDB
|
// Try to connect to MongoDB
|
||||||
const mongoDBLogger = new Logger('MongoDB');
|
const mongoDBLogger = new Logger('MongoDB');
|
||||||
|
|
Loading…
Reference in a new issue