+import { QueryTypes, Transaction } from 'sequelize'
import { Sequelize as SequelizeTypescript } from 'sequelize-typescript'
-import { isTestInstance } from '../helpers/core-utils'
+import { ActorCustomPageModel } from '@server/models/account/actor-custom-page'
+import { TrackerModel } from '@server/models/server/tracker'
+import { VideoTrackerModel } from '@server/models/server/video-tracker'
+import { UserModel } from '@server/models/user/user'
+import { UserNotificationModel } from '@server/models/user/user-notification'
+import { UserVideoHistoryModel } from '@server/models/user/user-video-history'
+import { VideoJobInfoModel } from '@server/models/video/video-job-info'
+import { VideoLiveSessionModel } from '@server/models/video/video-live-session'
+import { VideoSourceModel } from '@server/models/video/video-source'
+import { LocalVideoViewerModel } from '@server/models/view/local-video-viewer'
+import { LocalVideoViewerWatchSectionModel } from '@server/models/view/local-video-viewer-watch-section'
+import { isTestOrDevInstance } 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 { UserModel } from '../models/account/user'
-import { ActorModel } from '../models/activitypub/actor'
-import { ActorFollowModel } from '../models/activitypub/actor-follow'
+import { ActorModel } from '../models/actor/actor'
+import { ActorFollowModel } from '../models/actor/actor-follow'
+import { ActorImageModel } from '../models/actor/actor-image'
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 { PluginModel } from '../models/server/plugin'
import { ServerModel } from '../models/server/server'
+import { ServerBlocklistModel } from '../models/server/server-blocklist'
+import { UserNotificationSettingModel } from '../models/user/user-notification-setting'
+import { ScheduleVideoUpdateModel } from '../models/video/schedule-video-update'
import { TagModel } from '../models/video/tag'
+import { ThumbnailModel } from '../models/video/thumbnail'
import { VideoModel } from '../models/video/video'
-import { VideoAbuseModel } from '../models/video/video-abuse'
import { VideoBlacklistModel } from '../models/video/video-blacklist'
+import { VideoCaptionModel } from '../models/video/video-caption'
+import { VideoChangeOwnershipModel } from '../models/video/video-change-ownership'
import { VideoChannelModel } from '../models/video/video-channel'
import { VideoCommentModel } from '../models/video/video-comment'
import { VideoFileModel } from '../models/video/video-file'
-import { VideoShareModel } from '../models/video/video-share'
-import { VideoTagModel } from '../models/video/video-tag'
-import { CONFIG } from './config'
-import { ScheduleVideoUpdateModel } from '../models/video/schedule-video-update'
-import { VideoCaptionModel } from '../models/video/video-caption'
import { VideoImportModel } from '../models/video/video-import'
-import { VideoViewModel } from '../models/video/video-views'
-import { VideoChangeOwnershipModel } from '../models/video/video-change-ownership'
-import { VideoRedundancyModel } from '../models/redundancy/video-redundancy'
-import { UserVideoHistoryModel } from '../models/account/user-video-history'
-import { AccountBlocklistModel } from '../models/account/account-blocklist'
-import { ServerBlocklistModel } from '../models/server/server-blocklist'
-import { UserNotificationModel } from '../models/account/user-notification'
-import { UserNotificationSettingModel } from '../models/account/user-notification-setting'
-import { VideoStreamingPlaylistModel } from '../models/video/video-streaming-playlist'
+import { VideoLiveModel } from '../models/video/video-live'
import { VideoPlaylistModel } from '../models/video/video-playlist'
import { VideoPlaylistElementModel } from '../models/video/video-playlist-element'
-import { ThumbnailModel } from '../models/video/thumbnail'
-import { PluginModel } from '../models/server/plugin'
-import { QueryTypes, Transaction } from 'sequelize'
+import { VideoShareModel } from '../models/video/video-share'
+import { VideoStreamingPlaylistModel } from '../models/video/video-streaming-playlist'
+import { VideoTagModel } from '../models/video/video-tag'
+import { VideoViewModel } from '../models/view/video-view'
+import { CONFIG } from './config'
require('pg').defaults.parseInt8 = true // Avoid BIGINT to be converted to string
const port = CONFIG.DATABASE.PORT
const poolMax = CONFIG.DATABASE.POOL.MAX
+let dialectOptions: any = {}
+
+if (CONFIG.DATABASE.SSL) {
+ dialectOptions = {
+ ssl: {
+ rejectUnauthorized: false
+ }
+ }
+}
+
const sequelizeTypescript = new SequelizeTypescript({
database: dbname,
dialect: 'postgres',
+ dialectOptions,
host,
port,
username,
pool: {
max: poolMax
},
- benchmark: isTestInstance(),
+ benchmark: isTestOrDevInstance(),
isolationLevel: Transaction.ISOLATION_LEVELS.SERIALIZABLE,
logging: (message: string, benchmark: number) => {
if (process.env.NODE_DB_LOG === 'false') return
- let newMessage = message
- if (isTestInstance() === true && benchmark !== undefined) {
- newMessage += ' | ' + benchmark + 'ms'
+ let newMessage = 'Executed SQL request'
+ if (isTestOrDevInstance() === true && benchmark !== undefined) {
+ 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,
TagModel,
AccountVideoRateModel,
UserModel,
+ AbuseMessageModel,
+ AbuseModel,
+ VideoCommentAbuseModel,
VideoAbuseModel,
VideoModel,
VideoChangeOwnershipModel,
VideoChannelModel,
VideoShareModel,
VideoFileModel,
+ VideoSourceModel,
VideoCaptionModel,
VideoBlacklistModel,
VideoTagModel,
VideoViewModel,
VideoRedundancyModel,
UserVideoHistoryModel,
+ VideoLiveModel,
+ VideoLiveSessionModel,
AccountBlocklistModel,
ServerBlocklistModel,
UserNotificationModel,
VideoStreamingPlaylistModel,
VideoPlaylistModel,
VideoPlaylistElementModel,
+ LocalVideoViewerModel,
+ LocalVideoViewerWatchSectionModel,
ThumbnailModel,
- PluginModel
+ TrackerModel,
+ VideoTrackerModel,
+ PluginModel,
+ ActorCustomPageModel,
+ VideoJobInfoModel
])
// Check extensions exist in the database
await createFunctions()
if (!silent) logger.info('Database %s is ready.', dbname)
-
- return
}
// ---------------------------------------------------------------------------
export {
initDatabaseModels,
+ checkDatabaseConnectionOrDie,
sequelizeTypescript
}
projects / github / Chocobozzz / PeerTube.git / blobdiff