yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-05 02:39:33 +02:00
Code Issues Releases Wiki Activity

Simplify createServer args

Browse source
This commit is contained in:
Chocobozzz 2021-07-22 12:07:26 +02:00
parent 7a397c7f15
commit 2e980ed30d
No known key found for this signature in database
GPG key ID: 583A612D890159BE
4 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
shared/extra-utils/server/server.ts
View file

@ -41,7 +41,8 @@ import { StatsCommand } from './stats-command'
export type RunServerOptions = {
hideLogs?: boolean
execArgv?: string[]
nodeArgs?: string[]
peertubeArgs?: string[]
}
export class PeerTubeServer {
@ -176,13 +177,13 @@ export class PeerTubeServer {
this.port = parseInt(parsed.port)
}
async flushAndRun (configOverride?: Object, args = [], options: RunServerOptions = {}) {
async flushAndRun (configOverride?: Object, options: RunServerOptions = {}) {
await ServersCommand.flushTests(this.internalServerNumber)
return this.run(configOverride, args, options)
return this.run(configOverride, options)
}
async run (configOverrideArg?: any, args = [], options: RunServerOptions = {}) {
async run (configOverrideArg?: any, options: RunServerOptions = {}) {
// These actions are async so we need to be sure that they have both been done
const serverRunString = {
'HTTP server listening': false
@ -215,13 +216,13 @@ export class PeerTubeServer {
silent: true,
env,
detached: true,
execArgv: options.execArgv || []
execArgv: options.nodeArgs || []
}
return new Promise<void>(res => {
const self = this
this.app = fork(join(root(), 'dist', 'server.js'), args, forkOptions)
this.app = fork(join(root(), 'dist', 'server.js'), options.peertubeArgs || [], forkOptions)
this.app.stdout.on('data', function onStdout (data) {
let dontContinue = false