mirror of https://github.com/Chocobozzz/PeerTube
Don't start application until all components were initialized
parent
72de91cb10
commit
3d3441d6c7
25
server.ts
25
server.ts
|
@ -58,7 +58,11 @@ import { initDatabaseModels } from './server/initializers/database'
|
|||
import { migrate } from './server/initializers/migrator'
|
||||
migrate()
|
||||
.then(() => initDatabaseModels(false))
|
||||
.then(() => onDatabaseInitDone())
|
||||
.then(() => startApplication())
|
||||
.catch(err => {
|
||||
logger.error('Cannot start application.', { err })
|
||||
process.exit(-1)
|
||||
})
|
||||
|
||||
// ----------- PeerTube modules -----------
|
||||
import { installApplication } from './server/initializers'
|
||||
|
@ -179,17 +183,16 @@ app.use(function (err, req, res, next) {
|
|||
|
||||
// ----------- Run -----------
|
||||
|
||||
function onDatabaseInitDone () {
|
||||
async function startApplication () {
|
||||
const port = CONFIG.LISTEN.PORT
|
||||
|
||||
installApplication()
|
||||
.then(() => {
|
||||
// ----------- Make the server listening -----------
|
||||
server.listen(port, () => {
|
||||
// Emailer initialization and then job queue initialization
|
||||
await installApplication()
|
||||
|
||||
// Email initialization
|
||||
Emailer.Instance.init()
|
||||
Emailer.Instance.checkConnectionOrDie()
|
||||
.then(() => JobQueue.Instance.init())
|
||||
await Emailer.Instance.checkConnectionOrDie()
|
||||
|
||||
await JobQueue.Instance.init()
|
||||
|
||||
// Caches initializations
|
||||
VideosPreviewCache.Instance.init(CONFIG.CACHE.PREVIEWS.SIZE)
|
||||
|
@ -201,8 +204,8 @@ function onDatabaseInitDone () {
|
|||
// Redis initialization
|
||||
Redis.Instance.init()
|
||||
|
||||
// Make server listening
|
||||
server.listen(port)
|
||||
logger.info('Server listening on port %d', port)
|
||||
logger.info('Web server: %s', CONFIG.WEBSERVER.URL)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
|
|
@ -60,6 +60,8 @@ class Emailer {
|
|||
async checkConnectionOrDie () {
|
||||
if (!this.transporter) return
|
||||
|
||||
logger.info('Testing SMTP server...')
|
||||
|
||||
try {
|
||||
const success = await this.transporter.verify()
|
||||
if (success !== true) this.dieOnConnectionFailure()
|
||||
|
|
Loading…
Reference in New Issue