diff options
| author | buoyantair <buoyantair@protonmail.com> | 2018-11-16 02:37:16 +0530 |
|---|---|---|
| committer | buoyantair <buoyantair@protonmail.com> | 2018-11-16 02:37:16 +0530 |
| commit | ae28cdf327d782e629379eee1999096ca2a5d74b (patch) | |
| tree | bfe0d4b3a232d75161fe5bba9196553a388fc02a /shared/utils/server | |
| parent | d4681c0074ba51c62a3aeb9fb3f2cd071dd21e32 (diff) | |
| parent | 8cf998733496d44fa564e2e252356b871756c984 (diff) | |
| download | PeerTube-ae28cdf327d782e629379eee1999096ca2a5d74b.tar.gz PeerTube-ae28cdf327d782e629379eee1999096ca2a5d74b.tar.zst PeerTube-ae28cdf327d782e629379eee1999096ca2a5d74b.zip | |
Merge from upstream
Diffstat (limited to 'shared/utils/server')
| -rw-r--r-- | shared/utils/server/servers.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared/utils/server/servers.ts b/shared/utils/server/servers.ts index 3c946db27..f358a21f1 100644 --- a/shared/utils/server/servers.ts +++ b/shared/utils/server/servers.ts | |||
| @@ -69,7 +69,7 @@ function flushTests () { | |||
| 69 | }) | 69 | }) |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | function runServer (serverNumber: number, configOverride?: Object) { | 72 | function runServer (serverNumber: number, configOverride?: Object, args = []) { |
| 73 | const server: ServerInfo = { | 73 | const server: ServerInfo = { |
| 74 | app: null, | 74 | app: null, |
| 75 | serverNumber: serverNumber, | 75 | serverNumber: serverNumber, |
| @@ -115,7 +115,7 @@ function runServer (serverNumber: number, configOverride?: Object) { | |||
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | return new Promise<ServerInfo>(res => { | 117 | return new Promise<ServerInfo>(res => { |
| 118 | server.app = fork(join(__dirname, '..', '..', '..', '..', 'dist', 'server.js'), [], options) | 118 | server.app = fork(join(__dirname, '..', '..', '..', '..', 'dist', 'server.js'), args, options) |
| 119 | server.app.stdout.on('data', function onStdout (data) { | 119 | server.app.stdout.on('data', function onStdout (data) { |
| 120 | let dontContinue = false | 120 | let dontContinue = false |
| 121 | 121 | ||