Rename internal.internal to internal.serverError

hapijs · Sep 22, 2015 · 0a137e6 · 0a137e6
1 parent 4ff6c49
commit 0a137e6
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -263,14 +263,16 @@ exports.tooManyRequests = function (message, data) {
 
 exports.internal = function (message, data, statusCode) {
 
-    return internals.internal(message, data, statusCode, exports.internal);
+    return internals.serverError(message, data, statusCode, exports.internal);
 };
 
-internals.internal = function (message, data, statusCode, ctor) {
+internals.serverError = function (message, data, statusCode, ctor) {
 
-    var error = (data instanceof Error ? exports.wrap(data, statusCode, message) : internals.create(statusCode || 500, message, ctor));
-
-    if (data instanceof Error === false) {
+    var error;
+    if (data instanceof Error) {
+        error = exports.wrap(data, statusCode, message);
+    } else {
+        error = internals.create(statusCode || 500, message, ctor);
         error.data = data;
     }
 
@@ -280,31 +282,31 @@ internals.internal = function (message, data, statusCode, ctor) {
 
 exports.notImplemented = function (message, data) {
 
-    return internals.internal(message, data, 501, exports.notImplemented);
+    return internals.serverError(message, data, 501, exports.notImplemented);
 };
 
 
 exports.badGateway = function (message, data) {
 
-    return internals.internal(message, data, 502, exports.badGateway);
+    return internals.serverError(message, data, 502, exports.badGateway);
 };
 
 
 exports.serverTimeout = function (message, data) {
 
-    return internals.internal(message, data, 503, exports.serverTimeout);
+    return internals.serverError(message, data, 503, exports.serverTimeout);
 };
 
 
 exports.gatewayTimeout = function (message, data) {
 
-    return internals.internal(message, data, 504, exports.gatewayTimeout);
+    return internals.serverError(message, data, 504, exports.gatewayTimeout);
 };
 
 
 exports.badImplementation = function (message, data) {
 
-    var err = internals.internal(message, data, 500, exports.badImplementation);
+    var err = internals.serverError(message, data, 500, exports.badImplementation);
     err.isDeveloperError = true;
     return err;
 };