encrypt/gancio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor with logging and cleanup bootstrap

Browse Source
This commit is contained in:
lesion
2022-03-10 12:37:05 +01:00
parent c54706bfbc
commit d430417af2
4 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/api/auth.js
View File

@@ -25,15 +25,15 @@ const Auth = {
if (res.locals.user) { if (res.locals.user) {
next() next()
} else { } else {
res.sendStatus(404) res.sendStatus(403)
} }
}, },
isAdmin (req, res, next) { isAdmin (req, res, next) {
if (res.locals.user.is_admin) { if (res.locals.users && res.locals.user.is_admin) {
next() next()
} else { } else {
res.status(404) res.sendStatus(403)
} }
}, },

2
server/api/oauth.js
View File

@@ -34,7 +34,7 @@ oauth.use((req, res) => res.sendStatus(404))
oauth.use((err, req, res, next) => { oauth.use((err, req, res, next) => {
const error_msg = err.toString() const error_msg = err.toString()
log.error('[OAUTH USE] ' + error_msg) log.warn('[OAUTH USE] ' + error_msg)
res.status(500).send(error_msg) res.status(500).send(error_msg)
}) })

24
server/initialize.server.js
View File

@@ -1,14 +1,13 @@
const config = require('../server/config')
const settingsController = require('./api/controller/settings')
const log = require('../server/log')
const db = require('./api/models/index')
const dayjs = require('dayjs')
const timezone = require('dayjs/plugin/timezone')
// export default async function () { module.exports = function () {
module.exports = async function () { const config = require('../server/config')
config.load()
const log = require('../server/log')
const settingsController = require('./api/controller/settings')
const db = require('./api/models/index')
const dayjs = require('dayjs')
const timezone = require('dayjs/plugin/timezone')
async function start (nuxt) { async function start (nuxt) {
config.load()
if (config.status == 'READY') { if (config.status == 'READY') {
await db.initialize() await db.initialize()
@@ -55,10 +54,5 @@ module.exports = async function () {
process.on('SIGINT', shutdown) process.on('SIGINT', shutdown)
} }
if (this.nuxt) { return start(this.nuxt)
this.nuxt.hook('build:done', process.exit)
return start(this.nuxt)
} else {
return start()
}
} }

2
server/log.js
View File

@@ -15,7 +15,7 @@ const logger = createLogger({
transports: process.env.NODE_ENV !== 'production' transports: process.env.NODE_ENV !== 'production'
? [new transports.Console( ? [new transports.Console(
{ {
level: 'debug', level: config.log_level || 'debug',
format: format.combine(format.splat(), format.timestamp(), format.colorize(), gancioFormat) format: format.combine(format.splat(), format.timestamp(), format.colorize(), gancioFormat)
} }
)] )]