IntenseWebs/PeerTube
3
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge from upstream

Browse Source
This commit is contained in:
buoyantair
2018-11-16 02:37:16 +05:30
parent d4681c0074 8cf9987334
commit ae28cdf327
118 changed files with 4970 additions and 17172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shared/utils/index.ts
View File

@@ -4,8 +4,10 @@ export * from './server/clients'
export * from './server/config'
export * from './users/login'
export * from './miscs/miscs'
export * from './miscs/stubs'
export * from './server/follows'
export * from './requests/requests'
export * from './requests/activitypub'
export * from './server/servers'
export * from './videos/services'
export * from './users/users'

4
shared/utils/server/servers.ts
View File

@@ -69,7 +69,7 @@ function flushTests () {
})
}
function runServer (serverNumber: number, configOverride?: Object) {
function runServer (serverNumber: number, configOverride?: Object, args = []) {
const server: ServerInfo = {
app: null,
serverNumber: serverNumber,
@@ -115,7 +115,7 @@ function runServer (serverNumber: number, configOverride?: Object) {
}
return new Promise<ServerInfo>(res => {
server.app = fork(join(__dirname, '..', '..', '..', '..', 'dist', 'server.js'), [], options)
server.app = fork(join(__dirname, '..', '..', '..', '..', 'dist', 'server.js'), args, options)
server.app.stdout.on('data', function onStdout (data) {
let dontContinue = false