public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Reduce error handling noise

Browse source
This commit is contained in:
witzig 2017-03-10 15:38:04 +01:00
parent 17f09d4549
commit 1ea399cbe9
1 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
routes/editorapi.js
View file

@ -417,37 +417,32 @@ let parseGrapejsMultipartTestForm = (req, res, next) => {
}; };
router.post('/test', parseGrapejsMultipartTestForm, passport.csrfProtection, (req, res) => { router.post('/test', parseGrapejsMultipartTestForm, passport.csrfProtection, (req, res) => {
let sendError = err => {
if (req.query.editor === 'grapejs') {
res.status(500).json({
errors: err.message || err
});
} else {
res.status(500).send(err.message || err);
}
};
prepareHtml({ prepareHtml({
editorName: req.query.editor, editorName: req.query.editor,
html: req.body.html html: req.body.html
}, (err, html) => { }, (err, html) => {
if (err) { if (err) {
req.query.editor === 'grapejs' ? return sendError(err);
res.status(500).json({
errors: err.message || err
}) :
res.status(500).send(err.message || err);
return;
} }
settings.list(['defaultAddress', 'defaultFrom'], (err, configItems) => { settings.list(['defaultAddress', 'defaultFrom'], (err, configItems) => {
if (err) { if (err) {
req.query.editor === 'grapejs' ? return sendError(err);
res.status(500).json({
errors: err.message || err
}) :
res.status(500).send(err.message || err);
return;
} }
mailer.getMailer((err, transport) => { mailer.getMailer((err, transport) => {
if (err) { if (err) {
req.query.editor === 'grapejs' ? return sendError(err);
res.status(500).json({
errors: err.message || err
}) :
res.status(500).send(err.message || err);
return;
} }
let opts = { let opts = {
@ -465,12 +460,7 @@ router.post('/test', parseGrapejsMultipartTestForm, passport.csrfProtection, (re
transport.sendMail(opts, (err, info) => { transport.sendMail(opts, (err, info) => {
if (err) { if (err) {
req.query.editor === 'grapejs' ? return sendError(err);
res.status(500).json({
errors: err.message || err
}) :
res.status(500).send(err.message || err);
return;
} }
req.query.editor === 'grapejs' ? req.query.editor === 'grapejs' ?