Move try/catch logic to separate function

hapijs · May 24, 2016 · 5e98494 · 5e98494
1 parent 6f81b6a
commit 5e98494
Showing 1 changed file with 31 additions and 23 deletions.
diff --git a/lib/transmit.js b/lib/transmit.js
@@ -291,29 +291,9 @@ internals.transmit = function (response, callback) {
 
     // Write headers
 
-    const headers = Object.keys(response.headers);
-    try {
-        for (let i = 0; i < headers.length; ++i) {
-            const header = headers[i];
-            const value = response.headers[header];
-            if (value !== undefined) {
-                request.raw.res.setHeader(header, value);
-            }
-        }
-
-        request.raw.res.writeHead(response.statusCode);
-    }
-    catch (err) {
-
-        // Reset headers
-
-        request.raw.res._headers = null;
-        request.raw.res._headerNames = {};
-
-        return process.nextTick(() => {
-
-            return callback(Boom.wrap(err));
-        });
+    const res = internals.writeHead(response);
+    if (res) {
+        return process.nextTick(callback, res);
     }
 
     // Write payload
@@ -393,6 +373,34 @@ internals.transmit = function (response, callback) {
 };
 
 
+internals.writeHead = function (response) {
+
+    const res = response.request.raw.res;
+
+    try {
+        const headers = Object.keys(response.headers);
+        for (let i = 0; i < headers.length; ++i) {
+            const header = headers[i];
+            const value = response.headers[header];
+            if (value !== undefined) {
+                res.setHeader(header, value);
+            }
+        }
+
+        res.writeHead(response.statusCode);
+    }
+    catch (err) {
+
+        // Reset headers and return err
+
+        res._headers = null;
+        res._headerNames = {};
+
+        return Boom.wrap(err);
+    }
+};
+
+
 internals.Empty = function () {
 
     Stream.Readable.call(this);