aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared/utils/server
diff options
context:
space:
mode:
Diffstat (limited to 'shared/utils/server')
-rw-r--r--shared/utils/server/config.ts3
-rw-r--r--shared/utils/server/servers.ts13
2 files changed, 14 insertions, 2 deletions
diff --git a/shared/utils/server/config.ts b/shared/utils/server/config.ts
index 0c5512bab..29c24cff9 100644
--- a/shared/utils/server/config.ts
+++ b/shared/utils/server/config.ts
@@ -97,6 +97,9 @@ function updateCustomSubConfig (url: string, token: string, newConfig: any) {
97 '480p': true, 97 '480p': true,
98 '720p': false, 98 '720p': false,
99 '1080p': false 99 '1080p': false
100 },
101 hls: {
102 enabled: false
100 } 103 }
101 }, 104 },
102 import: { 105 import: {
diff --git a/shared/utils/server/servers.ts b/shared/utils/server/servers.ts
index 1e9c83c72..bde7dd5c2 100644
--- a/shared/utils/server/servers.ts
+++ b/shared/utils/server/servers.ts
@@ -146,7 +146,11 @@ function runServer (serverNumber: number, configOverride?: Object, args = []) {
146 146
147 server.app.stdout.removeListener('data', onStdout) 147 server.app.stdout.removeListener('data', onStdout)
148 148
149 process.on('exit', () => process.kill(server.app.pid)) 149 process.on('exit', () => {
150 try {
151 process.kill(server.app.pid)
152 } catch { /* empty */ }
153 })
150 154
151 res(server) 155 res(server)
152 }) 156 })
@@ -162,9 +166,13 @@ async function reRunServer (server: ServerInfo, configOverride?: any) {
162} 166}
163 167
164async function checkTmpIsEmpty (server: ServerInfo) { 168async function checkTmpIsEmpty (server: ServerInfo) {
169 return checkDirectoryIsEmpty(server, 'tmp')
170}
171
172async function checkDirectoryIsEmpty (server: ServerInfo, directory: string) {
165 const testDirectory = 'test' + server.serverNumber 173 const testDirectory = 'test' + server.serverNumber
166 174
167 const directoryPath = join(root(), testDirectory, 'tmp') 175 const directoryPath = join(root(), testDirectory, directory)
168 176
169 const directoryExists = existsSync(directoryPath) 177 const directoryExists = existsSync(directoryPath)
170 expect(directoryExists).to.be.true 178 expect(directoryExists).to.be.true
@@ -195,6 +203,7 @@ async function waitUntilLog (server: ServerInfo, str: string, count = 1) {
195// --------------------------------------------------------------------------- 203// ---------------------------------------------------------------------------
196 204
197export { 205export {
206 checkDirectoryIsEmpty,
198 checkTmpIsEmpty, 207 checkTmpIsEmpty,
199 ServerInfo, 208 ServerInfo,
200 flushAndRunMultipleServers, 209 flushAndRunMultipleServers,