X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=shared%2Fserver-commands%2Fserver%2Fserver.ts;h=af4423e8d25d413f44e6dc0a29d21463208a5cfa;hb=55f0a7a76249dda79d2815bd5c1d81ccd8bc7002;hp=617069b11fbae440fb2561ea6e670325fc37aac7;hpb=c55e3d7227fe1453869e309025996b9d75256d5d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/shared/server-commands/server/server.ts b/shared/server-commands/server/server.ts index 617069b11..af4423e8d 100644 --- a/shared/server-commands/server/server.ts +++ b/shared/server-commands/server/server.ts @@ -25,6 +25,7 @@ import { PlaylistsCommand, ServicesCommand, StreamingPlaylistsCommand, + VideoEditorCommand, VideosCommand } from '../videos' import { CommentsCommand } from '../videos/comments-command' @@ -124,6 +125,7 @@ export class PeerTubeServer { login?: LoginCommand users?: UsersCommand objectStorage?: ObjectStorageCommand + videoEditor?: VideoEditorCommand videos?: VideosCommand constructor (options: { serverNumber: number } | { url: string }) { @@ -210,18 +212,24 @@ export class PeerTubeServer { Object.assign(env, options.env) } + const execArgv = options.nodeArgs || [] + // FIXME: too slow :/ + // execArgv.push('--enable-source-maps') + const forkOptions = { silent: true, env, detached: true, - execArgv: options.nodeArgs || [] + execArgv } + const peertubeArgs = options.peertubeArgs || [] + return new Promise((res, rej) => { const self = this let aggregatedLogs = '' - this.app = fork(join(root(), 'dist', 'server.js'), options.peertubeArgs || [], forkOptions) + this.app = fork(join(root(), 'dist', 'server.js'), peertubeArgs, forkOptions) const onPeerTubeExit = () => rej(new Error('Process exited:\n' + aggregatedLogs)) const onParentExit = () => { @@ -388,5 +396,6 @@ export class PeerTubeServer { this.users = new UsersCommand(this) this.videos = new VideosCommand(this) this.objectStorage = new ObjectStorageCommand(this) + this.videoEditor = new VideoEditorCommand(this) } }