Skip to content

Commit ae45601

Browse files
alexk-blackopsalexk-blackops
authored andcommitted
error governor fix
1 parent 52a9353 commit ae45601

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

lib/error.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@ module.exports = {
1515
checkErrorLimitMessage : function checkErrorLimitMessage(ex) {
1616
var d = new Date(),
1717
min = d.getFullYear().toString() + d.getMonth().toString() + d.getDate().toString()
18-
+ d.getHours().toString() + d.getMinutes().toString(),
19-
key = ex.Error.Message + ex.Error.ErrorType + ex.Error.SourceMethod;
18+
+ d.getHours().toString() + d.getMinutes().toString();
2019

2120
if (!ex) {
2221
return true;
2322
}
2423

24+
key = ex.Error.Message + ex.Error.ErrorType + ex.Error.SourceMethod;
25+
2526
if (errorStorage[min]) {
2627
if (errorStorage[min][key]) {
2728
errorStorage[min][key] += 1;

lib/logger.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,11 @@ module.exports.methods = {
8989
if (level.toLowerCase() === 'error') {
9090
data = helpers.parseMeta(meta, true);
9191
// if duplicate errors cap per minute isn't exceeded and error object is passed, create an exception
92-
if (data.ex && error.checkErrorLimitMessage(data.ex)) {
92+
if (data.ex) {
9393
messageObject.Ex = error.formatEx(data.ex, req);
94+
if (!error.checkErrorLimitMessage(messageObject.Ex)) {
95+
delete messageObject.Ex;
96+
}
9497
}
9598
} else {
9699
data = helpers.parseMeta(meta);
@@ -102,8 +105,12 @@ module.exports.methods = {
102105
}
103106

104107
// if error object isn't passed with message & duplicate errors cap per minute isn't exceeded, create a string exception
105-
if (level.toLowerCase() === 'error' && !messageObject.Ex && error.checkErrorLimitMessage(data.ex)) {
108+
if (level.toLowerCase() === 'error' && !messageObject.Ex) {
106109
messageObject.Ex = error.formatEx(err, null, msg);
110+
111+
if (!error.checkErrorLimitMessage(messageObject.Ex)) {
112+
delete messageObject.Ex;
113+
}
107114
}
108115

109116
storage.push(messageObject);

0 commit comments

Comments
 (0)