interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix server run

This commit is contained in:
Chocobozzz 2021-07-16 10:20:44 +02:00
parent 59bbcced37
commit 08642a765e
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/tests/api/check-params/video-comments.ts
View File

@ -38,7 +38,7 @@ describe('Test video comments API validator', function () {
await setAccessTokensToServers([ server ]) await setAccessTokensToServers([ server ])
{ {
const video = await server.videos.upload({ attributes: {} }) video = await server.videos.upload({ attributes: {} })
pathThread = '/api/v1/videos/' + video.uuid + '/comment-threads' pathThread = '/api/v1/videos/' + video.uuid + '/comment-threads'
} }

14
shared/extra-utils/server/server.ts
View File

@ -219,6 +219,8 @@ export class PeerTubeServer {
} }
return new Promise<void>(res => { return new Promise<void>(res => {
const self = this
this.app = fork(join(root(), 'dist', 'server.js'), args, forkOptions) this.app = fork(join(root(), 'dist', 'server.js'), args, forkOptions)
this.app.stdout.on('data', function onStdout (data) { this.app.stdout.on('data', function onStdout (data) {
let dontContinue = false let dontContinue = false
@ -228,10 +230,10 @@ export class PeerTubeServer {
const regexp = regexps[key] const regexp = regexps[key]
const matches = data.toString().match(regexp) const matches = data.toString().match(regexp)
if (matches !== null) { if (matches !== null) {
if (key === 'client_id') this.store.client.id = matches[1] if (key === 'client_id') self.store.client.id = matches[1]
else if (key === 'client_secret') this.store.client.secret = matches[1] else if (key === 'client_secret') self.store.client.secret = matches[1]
else if (key === 'user_username') this.store.user.username = matches[1] else if (key === 'user_username') self.store.user.username = matches[1]
else if (key === 'user_password') this.store.user.password = matches[1] else if (key === 'user_password') self.store.user.password = matches[1]
} }
} }
@ -247,12 +249,12 @@ export class PeerTubeServer {
if (options.hideLogs === false) { if (options.hideLogs === false) {
console.log(data.toString()) console.log(data.toString())
} else { } else {
this.app.stdout.removeListener('data', onStdout) self.app.stdout.removeListener('data', onStdout)
} }
process.on('exit', () => { process.on('exit', () => {
try { try {
process.kill(this.server.app.pid) process.kill(self.server.app.pid)
} catch { /* empty */ } } catch { /* empty */ }
}) })