Move coerceError to cuvva-error.js

cuvva · Sep 1, 2015 · b0e59cf · b0e59cf
1 parent 763ff0b
commit b0e59cf
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 26 deletions.
diff --git a/lib/coerce-error.js b/lib/coerce-error.js
diff --git a/lib/cuvva-error.js b/lib/cuvva-error.js
@@ -33,3 +33,23 @@ CuvvaError.httpStatusMap = {};
 
 util.inherits(CuvvaError, Error);
 module.exports = CuvvaError;
+
+module.exports.coerceError = function (error) {
+	if (error instanceof CuvvaError)
+		return error;
+
+	var newError;
+
+	if (error instanceof Error) {
+		newError = new CuvvaError('unknown', { message: error.message });
+		Object.defineProperty(newError, 'stack', { get: function() { return error.stack } });
+	} else {
+		newError = new CuvvaError('unknown', { error: error });
+	}
+
+	if (error.statusCode)
+		newError.httpStatus = error.statusCode;
+
+	return newError;
+};
+
diff --git a/lib/index.js b/lib/index.js
@@ -83,5 +83,5 @@ module.exports.warn = logger('warn');
 module.exports.error = logger('error');
 module.exports.fatal = logger('fatal');
 
-module.exports.coerceError = require('./coerce-error.js');
+module.exports.coerceError = CuvvaError.coerceError;
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "cuvva-log",
-	"version": "0.5.2",
+	"version": "0.5.3",
 	"description": "Super simple standardized logging used by all Cuvva systems",
 	"homepage": "https://github.com/cuvva/cuvva-log-node",
 	"bugs": "https://github.com/cuvva/cuvva-log-node/issues",

diff --git a/test/index.js b/test/index.js
@@ -13,7 +13,7 @@ test('log.debug() prints correctly', function (t) {
 		log.debug('test_error');
 	});
 
-	t.equals(err[0], 'debug:{"code":"test_error","httpStatus":500}\n');
+	t.equals(err[0], 'debug:{"code":"test_error"}\n');
 	t.end();
 });
 
@@ -22,7 +22,7 @@ test('log.info() prints correctly', function (t) {
 		log.info('test_error');
 	});
 
-	t.equals(err[0], 'info:{"code":"test_error","httpStatus":500}\n');
+	t.equals(err[0], 'info:{"code":"test_error"}\n');
 	t.end();
 });
 
@@ -31,7 +31,7 @@ test('log.warn() prints correctly', function (t) {
 		log.warn('test_error');
 	});
 
-	t.equals(err[0], 'warn:{"code":"test_error","httpStatus":500}\n');
+	t.equals(err[0], 'warn:{"code":"test_error"}\n');
 	t.end();
 });
 
@@ -40,7 +40,7 @@ test('log.error() prints correctly', function (t) {
 		log.error('test_error');
 	});
 
-	t.equals(err[0], 'error:{"code":"test_error","httpStatus":500}\n');
+	t.equals(err[0], 'error:{"code":"test_error"}\n');
 	t.end();
 });
 
@@ -49,7 +49,7 @@ test('log.fatal() prints correctly', function (t) {
 		log.fatal('test_error');
 	});
 
-	t.equals(err[0], 'fatal:{"code":"test_error","httpStatus":500}\n');
+	t.equals(err[0], 'fatal:{"code":"test_error"}\n');
 	t.end();
 });
 
@@ -58,6 +58,6 @@ test('log prints JSON correctly', function (t) {
 		log.error('test_error', { a: 'b', c: 'd' });
 	});
 
-	t.equals(err[0], 'error:{"code":"test_error","httpStatus":500,"meta":{"a":"b","c":"d"}}\n');
+	t.equals(err[0], 'error:{"code":"test_error","meta":{"a":"b","c":"d"}}\n');
 	t.end();
 });