mirror of
https://github.com/nodemailer/wildduck.git
synced 2025-09-23 21:47:32 +08:00
handle name parsing failures
This commit is contained in:
parent
0b09f1d87e
commit
fa695adc70
3 changed files with 13 additions and 4 deletions
|
@ -337,7 +337,7 @@ function loadJournalStream(db, req, res, user, lastEventId, done) {
|
|||
|
||||
if (!e || !e.command) {
|
||||
// skip
|
||||
return processNext();
|
||||
return setImmediate(processNext);
|
||||
}
|
||||
|
||||
switch (e.command) {
|
||||
|
@ -354,10 +354,16 @@ function loadJournalStream(db, req, res, user, lastEventId, done) {
|
|||
break;
|
||||
}
|
||||
|
||||
res.write(formatJournalData(e));
|
||||
try {
|
||||
let data = formatJournalData(e);
|
||||
res.write(data);
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
console.error(e);
|
||||
}
|
||||
|
||||
processed++;
|
||||
processNext();
|
||||
return setImmediate(processNext);
|
||||
});
|
||||
};
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
'use strict';
|
||||
|
||||
const log = require('npmlog');
|
||||
const config = require('wild-config');
|
||||
const Joi = require('../joi');
|
||||
const MongoPaging = require('mongo-cursor-pagination');
|
||||
|
@ -727,6 +728,7 @@ module.exports = (db, server, userHandler) => {
|
|||
try {
|
||||
id = await userHandler.create(result.value);
|
||||
} catch (err) {
|
||||
log.error('API', err);
|
||||
res.json({
|
||||
error: err.message,
|
||||
code: err.code,
|
||||
|
|
|
@ -1501,8 +1501,8 @@ class UserHandler {
|
|||
}
|
||||
|
||||
if (this.messageHandler && !data.emptyAddress) {
|
||||
let parsedName = humanname.parse(userData.name || '');
|
||||
try {
|
||||
let parsedName = humanname.parse(userData.name || '');
|
||||
await this.pushDefaultMessages(userData, {
|
||||
NAME: userData.name || userData.username || address,
|
||||
FNAME: parsedName.firstName,
|
||||
|
@ -1511,6 +1511,7 @@ class UserHandler {
|
|||
EMAIL: address
|
||||
});
|
||||
} catch (err) {
|
||||
log.error('DB', 'PARSEFAIL name=%s error=%s', userData.name, err.message);
|
||||
// ignore?
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue