improve logging

This commit is contained in:
les
2021-04-28 12:44:26 +02:00
parent f7ba790398
commit 5f8bbd68c8
16 changed files with 63 additions and 39 deletions

View File

@@ -17,7 +17,7 @@ const announceController = {
announcement: req.body.announcement,
visible: true
}
log.debug('Create announcement ', req.body.title)
log.info('Create announcement: "%s" ', req.body.title)
const announce = await Announcement.create(announcementDetail)
res.json(announce)
},
@@ -34,20 +34,20 @@ const announceController = {
announce = await announce.update(announceDetails)
res.json(announce)
} catch (e) {
log.debug('Toggle announcement failed ', e)
log.error('Toggle announcement failed: %s ', e)
res.sendStatus(404)
}
},
async remove (req, res) {
log.debug('Remove announcement ', req.params.announce_id)
log.info('Remove announcement "%d"', req.params.announce_id)
const announce_id = req.params.announce_id
try {
const announce = await Announcement.findByPk(announce_id)
await announce.destroy()
res.sendStatus(200)
} catch (e) {
log.debug('Remove announcement failed ', e)
log.error('Remove announcement failed: "%s" ', e)
res.sendStatus(404)
}
}

View File

@@ -118,12 +118,12 @@ const eventController = {
order: [[Resource, 'id', 'DESC']]
})
} catch (e) {
console.error(e)
log.error(e)
return res.sendStatus(400)
}
if (!event) {
return res.sendStatus(400)
return res.sendStatus(404)
}
// get prev and next event
@@ -147,6 +147,7 @@ const eventController = {
order: [['start_datetime', 'DESC']]
})
// TODO: also check if event is mine
if (event && (event.is_visible || is_admin)) {
event = event.get()
event.next = next && (next.slug || next.id)

View File

@@ -61,7 +61,7 @@ const settingsController = {
// add pub/priv instance key if needed
if (!settingsController.settings.publicKey) {
log.debug('Instance priv/pub key not found')
log.info('Instance priv/pub key not found, generating....')
const { publicKey, privateKey } = await generateKeyPair('rsa', {
modulusLength: 4096,
publicKeyEncoding: {
@@ -92,7 +92,7 @@ const settingsController = {
},
async set (key, value, is_secret = false) {
log.debug(`SET ${key} ${value}`)
log.info(`SET ${key} ${value}`)
try {
const [setting, created] = await Setting.findOrCreate({
where: { key },
@@ -115,7 +115,8 @@ const settingsController = {
setLogo (req, res) {
if (!req.file) {
return res.status(400).send('Mmmmm sould not be here!')
settingsController.set('logo', false)
return res.status(200)
}
const uploadedPath = path.join(req.file.destination, req.file.filename)

View File

@@ -96,13 +96,14 @@ const userController = {
return res.status(404).json('Invalid email')
}
log.debug('Register user ', req.body.email)
log.info('Register user ', req.body.email)
const user = await User.create(req.body)
log.debug(`Sending registration email to ${user.email}`)
log.info(`Sending registration email to ${user.email}`)
mail.send(user.email, 'register', { user, config }, req.settings.locale)
mail.send(config.admin_email, 'admin_register', { user, config })
res.sendStatus(200)
} catch (e) {
log.error('Registration error: "%s"', e)
res.status(404).json(e)
}
},
@@ -115,6 +116,7 @@ const userController = {
mail.send(user.email, 'user_confirm', { user, config }, req.settings.locale)
res.json(user)
} catch (e) {
log.error('User creation error: %s', e)
res.status(404).json(e)
}
},
@@ -125,6 +127,7 @@ const userController = {
user.destroy()
res.sendStatus(200)
} catch (e) {
log.error('User removal error: "%s"', e)
res.status(404).json(e)
}
}

View File

@@ -19,7 +19,7 @@ const mail = {
},
_send (addresses, template, locals, locale) {
log.debug(`Send ${template} email to ${addresses} with locale ${locale}`)
log.info(`Send ${template} email to ${addresses} with locale ${locale}`)
const email = new Email({
views: { root: path.join(__dirname, '..', 'emails') },
htmlToText: true,
@@ -61,8 +61,7 @@ const mail = {
}
return email.send(msg)
.catch(e => {
log.error('Error sending email =>')
log.error(e)
log.error('Error sending email => %s', e)
})
}
}

View File

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