Try to fix tests

pull/4696/head
Chocobozzz 2022-01-04 09:16:43 +01:00
parent 7298cad6ce
commit 8f5a1f36b5
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 31 additions and 16 deletions

View File

@ -1,4 +1,4 @@
import { createClient } from 'redis' import { createClient, RedisClientOptions, RedisModules } from 'redis'
import { exists } from '@server/helpers/custom-validators/misc' import { exists } from '@server/helpers/custom-validators/misc'
import { sha256 } from '@shared/extra-utils' import { sha256 } from '@shared/extra-utils'
import { logger } from '../helpers/logger' import { logger } from '../helpers/logger'
@ -37,29 +37,43 @@ class Redis {
this.client = createClient(Redis.getRedisClientOptions()) this.client = createClient(Redis.getRedisClientOptions())
logger.info('Connecting to redis...')
this.client.connect() this.client.connect()
.then(() => { this.connected = true }) .then(() => {
.catch(err => { logger.info('Connected to redis.')
this.connected = true
}).catch(err => {
logger.error('Cannot connect to redis', { err }) logger.error('Cannot connect to redis', { err })
process.exit(-1) process.exit(-1)
}) })
this.client.on('error', err => {
logger.error('Error in Redis client.', { err })
process.exit(-1)
})
this.prefix = 'redis-' + WEBSERVER.HOST + '-' this.prefix = 'redis-' + WEBSERVER.HOST + '-'
} }
static getRedisClientOptions () { static getRedisClientOptions () {
return Object.assign({}, let config: RedisClientOptions<RedisModules, {}> = {
CONFIG.REDIS.AUTH ? { password: CONFIG.REDIS.AUTH } : {}, socket: {
(CONFIG.REDIS.DB) ? { db: CONFIG.REDIS.DB } : {}, connectTimeout: 20000 // Could be slow since node use sync call to compile PeerTube
(CONFIG.REDIS.HOSTNAME && CONFIG.REDIS.PORT) }
? { host: CONFIG.REDIS.HOSTNAME, port: CONFIG.REDIS.PORT } }
: { path: CONFIG.REDIS.SOCKET }
) if (CONFIG.REDIS.AUTH) {
config = { ...config, password: CONFIG.REDIS.AUTH }
}
if (CONFIG.REDIS.DB) {
config = { ...config, database: CONFIG.REDIS.DB }
}
if (CONFIG.REDIS.HOSTNAME && CONFIG.REDIS.PORT) {
config.socket = { ...config.socket, host: CONFIG.REDIS.HOSTNAME, port: CONFIG.REDIS.PORT }
} else {
config.socket = { ...config.socket, path: CONFIG.REDIS.SOCKET }
}
return config
} }
getClient () { getClient () {

View File

@ -211,7 +211,8 @@ export class PeerTubeServer {
} }
const execArgv = options.nodeArgs || [] const execArgv = options.nodeArgs || []
execArgv.push('--enable-source-maps') // FIXME: too slow :/
// execArgv.push('--enable-source-maps')
const forkOptions = { const forkOptions = {
silent: true, silent: true,