Skip to content

Commit 5575bcf

Browse files
indexzeroindexzero
committed
[minor] Remove commented out debug statements.
1 parent 558a8a4 commit 5575bcf

File tree

1 file changed

+48
-63
lines changed

1 file changed

+48
-63
lines changed

Diff for: ‎lib/node-http-proxy.js

+48-63
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,7 @@ HttpProxy.prototype.buffer = function (obj) {
349349
this.resume = function () {
350350
console.error("Cannot resume buffer after destroying it.");
351351
};
352+
352353
onData = onEnd = events = obj = null;
353354
},
354355
resume: function () {
@@ -414,9 +415,11 @@ HttpProxy.prototype.proxyRequest = function (req, res, options) {
414415
try {
415416
res.writeHead(404);
416417
res.end();
417-
} catch (er) {
418+
}
419+
catch (er) {
418420
console.error("res.writeHead/res.end error: %s", er.message);
419421
}
422+
420423
return;
421424
}
422425

@@ -492,11 +495,8 @@ HttpProxy.prototype.proxyRequest = function (req, res, options) {
492495
}
493496
}
494497

495-
try {
496-
res.end();
497-
} catch (er) {
498-
console.error("res.end error: %s", er.message);
499-
}
498+
try { res.end() }
499+
catch (er) { console.error("res.end error: %s", er.message) }
500500
}
501501

502502
outgoing = {
@@ -524,11 +524,8 @@ HttpProxy.prototype.proxyRequest = function (req, res, options) {
524524

525525
// `response.statusCode === 304`: No 'data' event and no 'end'
526526
if (response.statusCode === 304) {
527-
try {
528-
res.end();
529-
} catch (er) {
530-
console.error("res.end error: %s", er.message)
531-
}
527+
try { res.end() }
528+
catch (er) { console.error("res.end error: %s", er.message) }
532529
return;
533530
}
534531

@@ -540,26 +537,24 @@ HttpProxy.prototype.proxyRequest = function (req, res, options) {
540537
if (req.method !== 'HEAD' && res.writable) {
541538
try {
542539
var flushed = res.write(chunk);
543-
} catch (er) {
540+
}
541+
catch (er) {
544542
console.error("res.write error: %s", er.message);
545-
try {
546-
res.end();
547-
} catch (er) {
548-
console.error("res.end error: %s", er.message);
549-
}
543+
544+
try { res.end() }
545+
catch (er) { console.error("res.end error: %s", er.message) }
546+
550547
return;
551548
}
552549
}
553550
if (!flushed) {
554-
//console.error('backpressure 554');
555551
response.pause();
552+
556553
res.once('drain', function () {
557-
try {
558-
response.resume();
559-
} catch (er) {
560-
console.error("response.resume error: %s", er.message);
561-
}
554+
try { response.resume() }
555+
catch (er) { console.error("response.resume error: %s", er.message) }
562556
});
557+
563558
setTimeout(function () {
564559
res.emit('drain');
565560
}, 100);
@@ -574,11 +569,9 @@ HttpProxy.prototype.proxyRequest = function (req, res, options) {
574569
response.on('end', function () {
575570
if (!errState) {
576571
reverseProxy.removeListener('error', proxyError);
577-
try {
578-
res.end();
579-
} catch (er) {
580-
console.error("res.end error: %s", er.message);
581-
}
572+
573+
try { res.end() }
574+
catch (er) { console.error("res.end error: %s", er.message) }
582575

583576
// Emit the `end` event now that we have completed proxying
584577
self.emit('end', req, res);
@@ -595,15 +588,13 @@ HttpProxy.prototype.proxyRequest = function (req, res, options) {
595588
if (!errState) {
596589
var flushed = reverseProxy.write(chunk);
597590
if (!flushed) {
598-
//console.error('backpressure 594');
599591
req.pause();
592+
600593
reverseProxy.once('drain', function () {
601-
try {
602-
req.resume();
603-
} catch (er) {
604-
console.error("req.resume error: %s", er.message);
605-
}
594+
try { req.resume() }
595+
catch (er) { console.error("req.resume error: %s", er.message) }
606596
});
597+
607598
setTimeout(function () {
608599
reverseProxy.emit('drain');
609600
}, 100);
@@ -625,7 +616,8 @@ HttpProxy.prototype.proxyRequest = function (req, res, options) {
625616
if (options.buffer) {
626617
if (!errState) {
627618
options.buffer.resume();
628-
} else {
619+
}
620+
else {
629621
options.buffer.destroy();
630622
}
631623
}
@@ -677,15 +669,13 @@ HttpProxy.prototype._forwardRequest = function (req) {
677669
req.on('data', function (chunk) {
678670
var flushed = forwardProxy.write(chunk);
679671
if (!flushed) {
680-
//console.error('backpressure 672');
681672
req.pause();
673+
682674
forwardProxy.once('drain', function () {
683-
try {
684-
req.resume();
685-
} catch (er) {
686-
console.error("req.resume error: %s", er.message);
687-
}
675+
try { req.resume() }
676+
catch (er) { console.error("req.resume error: %s", er.message) }
688677
});
678+
689679
setTimeout(function () {
690680
forwardProxy.emit('drain');
691681
}, 100);
@@ -786,21 +776,19 @@ HttpProxy.prototype.proxyWebSocketRequest = function (req, socket, head, options
786776
self.emit('websocket:outgoing', req, socket, head, data);
787777
var flushed = reverseProxy.incoming.socket.write(data);
788778
if (!flushed) {
789-
//console.error('backpressure 777');
790779
proxySocket.pause();
780+
791781
reverseProxy.incoming.socket.once('drain', function () {
792-
try {
793-
proxySocket.resume();
794-
} catch (er) {
795-
console.error("proxySocket.resume error: %s", er.message);
796-
}
782+
try { proxySocket.resume() }
783+
catch (er) { console.error("proxySocket.resume error: %s", er.message) }
797784
});
785+
798786
setTimeout(function () {
799787
reverseProxy.incoming.socket.emit('drain');
800788
}, 100);
801789
}
802790
}
803-
catch (e) {
791+
catch (ex) {
804792
detach();
805793
reverseProxy.incoming.socket.end();
806794
proxySocket.end();
@@ -817,21 +805,19 @@ HttpProxy.prototype.proxyWebSocketRequest = function (req, socket, head, options
817805
self.emit('websocket:incoming', reverseProxy, reverseProxy.incoming, head, data);
818806
var flushed = proxySocket.write(data);
819807
if (!flushed) {
820-
//console.error('backpressure 804');
821808
reverseProxy.incoming.socket.pause();
809+
822810
proxySocket.once('drain', function () {
823-
try {
824-
reverseProxy.incoming.socket.resume();
825-
} catch (er) {
826-
console.error("reverseProxy.incoming.socket.resume error: %s", er.message);
827-
}
811+
try { reverseProxy.incoming.socket.resume() }
812+
catch (ex) { console.error("reverseProxy.incoming.socket.resume error: %s", er.message) }
828813
});
814+
829815
setTimeout(function () {
830816
proxySocket.emit('drain');
831817
}, 100);
832818
}
833819
}
834-
catch (e) {
820+
catch (ex) {
835821
detach();
836822
proxySocket.end();
837823
socket.end();
@@ -991,23 +977,21 @@ HttpProxy.prototype.proxyWebSocketRequest = function (req, socket, head, options
991977
socket.write(sdata);
992978
var flushed = socket.write(data);
993979
if (!flushed) {
994-
//console.error('backpressure 974');
995980
reverseProxy.socket.pause();
981+
996982
socket.once('drain', function () {
997-
try {
998-
reverseProxy.socket.resume();
999-
} catch (er) {
1000-
console.error("reverseProxy.socket.resume error: %s", er.message);
1001-
}
983+
try { reverseProxy.socket.resume() }
984+
catch (er) { console.error("reverseProxy.socket.resume error: %s", er.message) }
1002985
});
986+
1003987
setTimeout(function () {
1004988
socket.emit('drain');
1005989
}, 100);
1006990
}
1007991

1008992
}
1009993
catch (ex) {
1010-
proxyError(ex)
994+
proxyError(ex);
1011995
}
1012996

1013997
// Catch socket errors
@@ -1034,7 +1018,8 @@ HttpProxy.prototype.proxyWebSocketRequest = function (req, socket, head, options
10341018
if (options.buffer) {
10351019
if (!errState) {
10361020
options.buffer.resume();
1037-
} else {
1021+
}
1022+
else {
10381023
options.buffer.destroy();
10391024
}
10401025
}

0 commit comments

Comments
 (0)