Skip to content

Commit 0fa2f72

Browse files
rokobrokob
committed
add back lastError on the rollbar instance
1 parent 06b5b85 commit 0fa2f72

File tree

5 files changed

+113
-0
lines changed

5 files changed

+113
-0
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ sauce_connect.log
77
coverage
88
.DS_Store
99
*.swp
10+
npm-debug.log

‎src/browser/rollbar.js

+36
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ function Rollbar(options, client) {
2424
if (this.options.captureUnhandledRejections) {
2525
globals.captureUnhandledRejections(window, this);
2626
}
27+
this.lastError = null;
2728
}
2829

2930
var _instance = null;
@@ -72,6 +73,9 @@ Rollbar.configure = function(options) {
7273
Rollbar.prototype.log = function() {
7374
var item = this._createItem(arguments);
7475
var uuid = item.uuid;
76+
if (this._sameAsLastError(item)) {
77+
return;
78+
}
7579
this.client.log(item);
7680
return {uuid: uuid};
7781
};
@@ -87,6 +91,9 @@ Rollbar.log = function() {
8791
Rollbar.prototype.debug = function() {
8892
var item = this._createItem(arguments);
8993
var uuid = item.uuid;
94+
if (this._sameAsLastError(item)) {
95+
return;
96+
}
9097
this.client.debug(item);
9198
return {uuid: uuid};
9299
};
@@ -102,6 +109,9 @@ Rollbar.debug = function() {
102109
Rollbar.prototype.info = function() {
103110
var item = this._createItem(arguments);
104111
var uuid = item.uuid;
112+
if (this._sameAsLastError(item)) {
113+
return;
114+
}
105115
this.client.info(item);
106116
return {uuid: uuid};
107117
};
@@ -117,6 +127,9 @@ Rollbar.info = function() {
117127
Rollbar.prototype.warn = function() {
118128
var item = this._createItem(arguments);
119129
var uuid = item.uuid;
130+
if (this._sameAsLastError(item)) {
131+
return;
132+
}
120133
this.client.warn(item);
121134
return {uuid: uuid};
122135
};
@@ -132,6 +145,9 @@ Rollbar.warn = function() {
132145
Rollbar.prototype.warning = function() {
133146
var item = this._createItem(arguments);
134147
var uuid = item.uuid;
148+
if (this._sameAsLastError(item)) {
149+
return;
150+
}
135151
this.client.warning(item);
136152
return {uuid: uuid};
137153
};
@@ -147,6 +163,9 @@ Rollbar.warning = function() {
147163
Rollbar.prototype.error = function() {
148164
var item = this._createItem(arguments);
149165
var uuid = item.uuid;
166+
if (this._sameAsLastError(item)) {
167+
return;
168+
}
150169
this.client.error(item);
151170
return {uuid: uuid};
152171
};
@@ -162,6 +181,9 @@ Rollbar.error = function() {
162181
Rollbar.prototype.critical = function() {
163182
var item = this._createItem(arguments);
164183
var uuid = item.uuid;
184+
if (this._sameAsLastError(item)) {
185+
return;
186+
}
165187
this.client.critical(item);
166188
return {uuid: uuid};
167189
};
@@ -198,6 +220,9 @@ Rollbar.prototype.handleUncaughtException = function(message, url, lineno, colno
198220
}
199221
item.level = this.options.uncaughtErrorLevel;
200222
item._isUncaught = true;
223+
if (this._sameAsLastError(item)) {
224+
return;
225+
}
201226
this.client.log(item);
202227
};
203228

@@ -226,6 +251,9 @@ Rollbar.prototype.handleUnhandledRejection = function(reason, promise) {
226251
item._isUncaught = true;
227252
item._originalArgs = item._originalArgs || [];
228253
item._originalArgs.push(promise);
254+
if (this._sameAsLastError(item)) {
255+
return;
256+
}
229257
this.client.log(item);
230258
};
231259

@@ -371,6 +399,14 @@ Rollbar.prototype._createItem = function(args) {
371399
return item;
372400
};
373401

402+
Rollbar.prototype._sameAsLastError = function(item) {
403+
if (this.lastError === item.err && this.lastError) {
404+
return true;
405+
}
406+
this.lastError = item.err;
407+
return false;
408+
};
409+
374410
function _getFirstFunction(args) {
375411
for (var i = 0, len = args.length; i < len; ++i) {
376412
if (_.isFunction(args[i])) {

‎src/server/rollbar.js

+30
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ function Rollbar(options, client) {
3737
if (this.options.handleUnhandledRejections) {
3838
this.handleUnhandledRejections();
3939
}
40+
this.lastError = null;
4041
}
4142

4243
var _instance = null;
@@ -85,6 +86,9 @@ Rollbar.configure = function(options) {
8586
Rollbar.prototype.log = function() {
8687
var item = this._createItem(arguments);
8788
var uuid = item.uuid;
89+
if (this._sameAsLastError(item)) {
90+
return;
91+
}
8892
this.client.log(item);
8993
return {uuid: uuid};
9094
};
@@ -100,6 +104,9 @@ Rollbar.log = function() {
100104
Rollbar.prototype.debug = function() {
101105
var item = this._createItem(arguments);
102106
var uuid = item.uuid;
107+
if (this._sameAsLastError(item)) {
108+
return;
109+
}
103110
this.client.debug(item);
104111
return {uuid: uuid};
105112
};
@@ -115,6 +122,9 @@ Rollbar.debug = function() {
115122
Rollbar.prototype.info = function() {
116123
var item = this._createItem(arguments);
117124
var uuid = item.uuid;
125+
if (this._sameAsLastError(item)) {
126+
return;
127+
}
118128
this.client.info(item);
119129
return {uuid: uuid};
120130
};
@@ -130,6 +140,9 @@ Rollbar.info = function() {
130140
Rollbar.prototype.warn = function() {
131141
var item = this._createItem(arguments);
132142
var uuid = item.uuid;
143+
if (this._sameAsLastError(item)) {
144+
return;
145+
}
133146
this.client.warn(item);
134147
return {uuid: uuid};
135148
};
@@ -146,6 +159,9 @@ Rollbar.warn = function() {
146159
Rollbar.prototype.warning = function() {
147160
var item = this._createItem(arguments);
148161
var uuid = item.uuid;
162+
if (this._sameAsLastError(item)) {
163+
return;
164+
}
149165
this.client.warning(item);
150166
return {uuid: uuid};
151167
};
@@ -162,6 +178,9 @@ Rollbar.warning = function() {
162178
Rollbar.prototype.error = function() {
163179
var item = this._createItem(arguments);
164180
var uuid = item.uuid;
181+
if (this._sameAsLastError(item)) {
182+
return;
183+
}
165184
this.client.error(item);
166185
return {uuid: uuid};
167186
};
@@ -178,6 +197,9 @@ Rollbar.error = function() {
178197
Rollbar.prototype.critical = function() {
179198
var item = this._createItem(arguments);
180199
var uuid = item.uuid;
200+
if (this._sameAsLastError(item)) {
201+
return;
202+
}
181203
this.client.critical(item);
182204
return {uuid: uuid};
183205
};
@@ -404,6 +426,14 @@ Rollbar.prototype._createItem = function(args) {
404426
return item;
405427
};
406428

429+
Rollbar.prototype._sameAsLastError = function(item) {
430+
if (this.lastError === item.err && this.lastError) {
431+
return true;
432+
}
433+
this.lastError = item.err;
434+
return false;
435+
};
436+
407437
function _getFirstFunction(args) {
408438
for (var i = 0, len = args.length; i < len; ++i) {
409439
if (_.isFunction(args[i])) {

‎test/browser.rollbar.test.js

+25
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,31 @@ describe('Rollbar()', function() {
105105

106106
done();
107107
});
108+
109+
it('should not log the same error twice in a row', function(done) {
110+
var client = new (TestClientGen())();
111+
var options = {};
112+
var rollbar = new Rollbar(options, client);
113+
114+
var args = [new Error('Whoa'), 'first', 'second'];
115+
var methods = 'log,debug,info,warn,warning,error,critical'.split(',');
116+
for (var i=0; i < methods.length; i++) {
117+
var msgA = 'Amessage:' + i;
118+
var msgB = 'Bmessage:' + i;
119+
rollbar[methods[i]](msgA);
120+
rollbar[methods[i]].apply(rollbar, args);
121+
rollbar[methods[i]].apply(rollbar, args);
122+
rollbar[methods[i]](msgB);
123+
for (var j=0; j<3; j++) {
124+
expect(client.logCalls[j+3*i].func).to.eql(methods[i]);
125+
}
126+
expect(client.logCalls[0+3*i].item.message).to.eql(msgA);
127+
expect(client.logCalls[1+3*i].item.err).to.be.ok();
128+
expect(client.logCalls[2+3*i].item.message).to.eql(msgB);
129+
}
130+
131+
done();
132+
});
108133
});
109134

110135
describe('createItem', function() {

‎test/server.rollbar.test.js

+21
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ function TestClientGen() {
2222
this.logCalls.push({func: fn, item: item});
2323
}.bind(this, fn)
2424
}
25+
this.clearLogCalls = function() {
26+
this.logCalls = [];
27+
};
2528
};
2629

2730
return TestClient;
@@ -178,6 +181,24 @@ vows.describe('rollbar')
178181
var item = r.client.logCalls[r.client.logCalls.length - 1].item
179182
assert.equal(item.err, err)
180183
},
184+
'should not log same one twice': function(r) {
185+
var err = new Error('hello!')
186+
r.client.clearLogCalls();
187+
var msgA = 'some message A';
188+
var msgB = 'some message B';
189+
r.log(msgA);
190+
r.log(err)
191+
r.log(err)
192+
r.log(msgB);
193+
var len = r.client.logCalls.length;
194+
assert.equal(len, 3);
195+
var msgItemA = r.client.logCalls[0].item
196+
var errItem = r.client.logCalls[1].item
197+
var msgItemB = r.client.logCalls[2].item
198+
assert.equal(msgItemA.message, msgA);
199+
assert.equal(errItem.err, err)
200+
assert.equal(msgItemB.message, msgB);
201+
},
181202
'should work with callback': function(r) {
182203
var err = new Error('hello!')
183204
var callback = function cb() {}

0 commit comments

Comments
 (0)