aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared/utils
diff options
context:
space:
mode:
Diffstat (limited to 'shared/utils')
-rw-r--r--shared/utils/index.ts2
-rw-r--r--shared/utils/server/servers.ts4
2 files changed, 4 insertions, 2 deletions
diff --git a/shared/utils/index.ts b/shared/utils/index.ts
index 897389824..905d93823 100644
--- a/shared/utils/index.ts
+++ b/shared/utils/index.ts
@@ -4,8 +4,10 @@ export * from './server/clients'
4export * from './server/config' 4export * from './server/config'
5export * from './users/login' 5export * from './users/login'
6export * from './miscs/miscs' 6export * from './miscs/miscs'
7export * from './miscs/stubs'
7export * from './server/follows' 8export * from './server/follows'
8export * from './requests/requests' 9export * from './requests/requests'
10export * from './requests/activitypub'
9export * from './server/servers' 11export * from './server/servers'
10export * from './videos/services' 12export * from './videos/services'
11export * from './users/users' 13export * from './users/users'
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
72function runServer (serverNumber: number, configOverride?: Object) { 72function 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