import { QueryTypes, Transaction } from 'sequelize'
import { Sequelize as SequelizeTypescript } from 'sequelize-typescript'
-import { AbuseModel } from '@server/models/abuse/abuse'
-import { AbuseMessageModel } from '@server/models/abuse/abuse-message'
-import { VideoAbuseModel } from '@server/models/abuse/video-abuse'
-import { VideoCommentAbuseModel } from '@server/models/abuse/video-comment-abuse'
+import { TrackerModel } from '@server/models/server/tracker'
+import { VideoTrackerModel } from '@server/models/server/video-tracker'
import { isTestInstance } from '../helpers/core-utils'
import { logger } from '../helpers/logger'
+import { AbuseModel } from '../models/abuse/abuse'
+import { AbuseMessageModel } from '../models/abuse/abuse-message'
+import { VideoAbuseModel } from '../models/abuse/video-abuse'
+import { VideoCommentAbuseModel } from '../models/abuse/video-comment-abuse'
import { AccountModel } from '../models/account/account'
import { AccountBlocklistModel } from '../models/account/account-blocklist'
import { AccountVideoRateModel } from '../models/account/account-video-rate'
+import { ActorImageModel } from '../models/account/actor-image'
import { UserModel } from '../models/account/user'
import { UserNotificationModel } from '../models/account/user-notification'
import { UserNotificationSettingModel } from '../models/account/user-notification-setting'
import { ActorModel } from '../models/activitypub/actor'
import { ActorFollowModel } from '../models/activitypub/actor-follow'
import { ApplicationModel } from '../models/application/application'
-import { AvatarModel } from '../models/avatar/avatar'
import { OAuthClientModel } from '../models/oauth/oauth-client'
import { OAuthTokenModel } from '../models/oauth/oauth-token'
import { VideoRedundancyModel } from '../models/redundancy/video-redundancy'
import { VideoCommentModel } from '../models/video/video-comment'
import { VideoFileModel } from '../models/video/video-file'
import { VideoImportModel } from '../models/video/video-import'
+import { VideoLiveModel } from '../models/video/video-live'
import { VideoPlaylistModel } from '../models/video/video-playlist'
import { VideoPlaylistElementModel } from '../models/video/video-playlist-element'
import { VideoShareModel } from '../models/video/video-share'
const username = CONFIG.DATABASE.USERNAME
const password = CONFIG.DATABASE.PASSWORD
const host = CONFIG.DATABASE.HOSTNAME
+const ssl = CONFIG.DATABASE.SSL
const port = CONFIG.DATABASE.PORT
const poolMax = CONFIG.DATABASE.POOL.MAX
port,
username,
password,
+ ssl,
pool: {
max: poolMax
},
logging: (message: string, benchmark: number) => {
if (process.env.NODE_DB_LOG === 'false') return
- let newMessage = message
+ let newMessage = 'Executed SQL request'
if (isTestInstance() === true && benchmark !== undefined) {
- newMessage += ' | ' + benchmark + 'ms'
+ newMessage += ' in ' + benchmark + 'ms'
}
- logger.debug(newMessage)
+ logger.debug(newMessage, { sql: message, tags: [ 'sql' ] })
}
})
+function checkDatabaseConnectionOrDie () {
+ sequelizeTypescript.authenticate()
+ .then(() => logger.debug('Connection to PostgreSQL has been established successfully.'))
+ .catch(err => {
+
+ logger.error('Unable to connect to PostgreSQL database.', { err })
+ process.exit(-1)
+ })
+}
+
async function initDatabaseModels (silent: boolean) {
sequelizeTypescript.addModels([
ApplicationModel,
ActorModel,
ActorFollowModel,
- AvatarModel,
+ ActorImageModel,
AccountModel,
OAuthClientModel,
OAuthTokenModel,
VideoViewModel,
VideoRedundancyModel,
UserVideoHistoryModel,
+ VideoLiveModel,
AccountBlocklistModel,
ServerBlocklistModel,
UserNotificationModel,
VideoPlaylistModel,
VideoPlaylistElementModel,
ThumbnailModel,
+ TrackerModel,
+ VideoTrackerModel,
PluginModel
])
export {
initDatabaseModels,
+ checkDatabaseConnectionOrDie,
sequelizeTypescript
}