Improved error handling.

papandreou · Aug 2, 2013 · 7973ace · 7973ace
1 parent 0b9bb70
commit 7973ace
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/lib/processImage.js b/lib/processImage.js
@@ -48,9 +48,15 @@ module.exports = function (options) {
 
                     function sendErrorResponse(err) {
                         if (!hasEnded) {
-                            res.statusCode = 500;
-                            res.end();
                             hasEnded = true;
+                            if (seenData) {
+                                res.statusCode = 500;
+                                res.end();
+                            } else {
+                                res.unhijack(function () {
+                                    next(err);
+                                });
+                            }
                         }
                     }
 
@@ -67,7 +73,9 @@ module.exports = function (options) {
                     // filters[filters.length - 1].pipe(res);
                     filters[filters.length - 1].on('data', function (chunk) {
                         seenData = true;
-                        res.write(chunk);
+                        if (!hasEnded) {
+                            res.write(chunk);
+                        }
                     }).on('end', function () {
                         if (!hasEnded) {
                             if (seenData) {