Skip to content

Commit 425aef7

Browse files
committed
Adding test for multiple subscribers on same domain and better error handling
1 parent 65928cd commit 425aef7

File tree

13 files changed

+5951
-854
lines changed

13 files changed

+5951
-854
lines changed

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14
1+
16

controllers/ping.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"use strict";
33

44
const bodyParser = require('body-parser'),
5+
ErrorResponse = require('../services/error-response'),
56
errorResult = require('../services/error-result'),
67
express = require('express'),
78
parsePingParams = require('../services/parse-ping-params'),
@@ -30,7 +31,9 @@
3031
}
3132

3233
function handleError(req, res, err) {
33-
console.error(err);
34+
if (!(err instanceof ErrorResponse)) {
35+
console.error(err);
36+
}
3437
processResponse(req, res, errorResult(err.message));
3538
}
3639

controllers/please-notify.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"use strict";
33

44
const bodyParser = require('body-parser'),
5+
ErrorResponse = require('../services/error-response'),
56
errorResult = require('../services/error-result'),
67
express = require('express'),
78
parseNotifyParams = require('../services/parse-notify-params'),
@@ -30,7 +31,9 @@
3031
}
3132

3233
function handleError(req, res, err) {
33-
console.error(err);
34+
if (!(err instanceof ErrorResponse)) {
35+
console.error(err);
36+
}
3437
processResponse(req, res, errorResult(err.message));
3538
}
3639

controllers/rpc2.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"use strict";
33

44
const bodyParser = require('body-parser'),
5+
ErrorResponse = require('../services/error-response'),
56
express = require('express'),
67
parseRpcRequest = require('../services/parse-rpc-request'),
78
parseNotifyParams = require('../services/parse-notify-params'),
@@ -26,7 +27,9 @@
2627
}
2728

2829
function handleError(req, res, err) {
29-
console.error(err);
30+
if (!(err instanceof ErrorResponse)) {
31+
console.error(err);
32+
}
3033
processResponse(req, res, rpcReturnFault(4, err.message));
3134
}
3235

controllers/view-log.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
(function () {
22
"use strict";
33

4-
const errorResult = require('../services/error-result'),
4+
const ErrorResponse = require('../services/error-response'),
5+
errorResult = require('../services/error-result'),
56
express = require('express'),
67
logEmitter = require('../services/log-emitter'),
78
mongodb = require('../services/mongodb'),
@@ -47,7 +48,9 @@
4748
}
4849

4950
function handleError(req, res, err) {
50-
console.error(err);
51+
if (!(err instanceof ErrorResponse)) {
52+
console.error(err);
53+
}
5154
processResponse(req, res, errorResult(err.message));
5255
}
5356

0 commit comments

Comments
 (0)