autoformat
This commit is contained in:
@@ -12,29 +12,29 @@ const settingsController = require('../controller/settings')
|
|||||||
|
|
||||||
const db = {
|
const db = {
|
||||||
sequelize: null,
|
sequelize: null,
|
||||||
close () {
|
close() {
|
||||||
if (db.sequelize) {
|
if (db.sequelize) {
|
||||||
return db.sequelize.close()
|
return db.sequelize.close()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
connect (dbConf = config.db) {
|
connect(dbConf = config.db) {
|
||||||
dbConf.dialectOptions = { autoJsonMap: true }
|
dbConf.dialectOptions = { autoJsonMap: true }
|
||||||
log.debug(`Connecting to DB: ${JSON.stringify(dbConf)}`)
|
log.debug(`Connecting to DB: ${JSON.stringify(dbConf)}`)
|
||||||
if (dbConf.dialect === 'sqlite') {
|
if (dbConf.dialect === 'sqlite') {
|
||||||
dbConf.retry = {
|
dbConf.retry = {
|
||||||
match: [
|
match: [
|
||||||
Sequelize.ConnectionError,
|
Sequelize.ConnectionError,
|
||||||
Sequelize.ConnectionTimedOutError,
|
Sequelize.ConnectionTimedOutError,
|
||||||
Sequelize.TimeoutError,
|
Sequelize.TimeoutError,
|
||||||
/Deadlock/i,
|
/Deadlock/i,
|
||||||
/SQLITE_BUSY/],
|
/SQLITE_BUSY/],
|
||||||
max: 15
|
max: 15
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
db.sequelize = new Sequelize(dbConf)
|
db.sequelize = new Sequelize(dbConf)
|
||||||
return db.sequelize.authenticate()
|
return db.sequelize.authenticate()
|
||||||
},
|
},
|
||||||
async isEmpty () {
|
async isEmpty() {
|
||||||
try {
|
try {
|
||||||
const users = await db.sequelize.query('SELECT * from users')
|
const users = await db.sequelize.query('SELECT * from users')
|
||||||
return !(users && users.length)
|
return !(users && users.length)
|
||||||
@@ -42,7 +42,7 @@ const db = {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async runMigrations () {
|
async runMigrations() {
|
||||||
const logging = config.status !== 'READY' ? false : log.debug.bind(log)
|
const logging = config.status !== 'READY' ? false : log.debug.bind(log)
|
||||||
const umzug = new Umzug({
|
const umzug = new Umzug({
|
||||||
storage: 'sequelize',
|
storage: 'sequelize',
|
||||||
@@ -61,7 +61,7 @@ const db = {
|
|||||||
})
|
})
|
||||||
return umzug.up()
|
return umzug.up()
|
||||||
},
|
},
|
||||||
async initialize () {
|
async initialize() {
|
||||||
if (config.status === 'CONFIGURED') {
|
if (config.status === 'CONFIGURED') {
|
||||||
try {
|
try {
|
||||||
await db.connect()
|
await db.connect()
|
||||||
|
|||||||
Reference in New Issue
Block a user