blueslip: Refactor log, info, warn, and error methods

(imported from commit 4b1eb94a7de0c2b25bde19c3c3a88a13ecb4d1c0)
This commit is contained in:
Zev Benjamin
2013-10-22 13:59:13 -04:00
parent 06390de20a
commit 1c841e4454

View File

@@ -273,38 +273,38 @@ exports.wrap_function = function blueslip_wrap_function(func) {
} }
}()); }());
exports.log = function blueslip_log (msg, more_info) { function build_arg_list(msg, more_info) {
console.log(msg); var args = [msg];
if (more_info !== undefined) { if (more_info !== undefined) {
console.log("Additional information: ", more_info); args.push("\nAdditional information: ", more_info);
} }
return args;
}
exports.log = function blueslip_log (msg, more_info) {
var args = build_arg_list(msg, more_info);
console.log.apply(console, args);
}; };
exports.info = function blueslip_info (msg, more_info) { exports.info = function blueslip_info (msg, more_info) {
console.info(msg); var args = build_arg_list(msg, more_info);
if (more_info !== undefined) { console.info.apply(console, args);
console.info("Additional information: ", more_info);
}
}; };
exports.warn = function blueslip_warn (msg, more_info) { exports.warn = function blueslip_warn (msg, more_info) {
console.warn(msg); var args = build_arg_list(msg, more_info);
console.warn.apply(console, args);
if (page_params.debug_mode) { if (page_params.debug_mode) {
console.trace(); console.trace();
} }
if (more_info !== undefined) {
console.warn("Additional information: ", more_info);
}
}; };
exports.error = function blueslip_error (msg, more_info) { exports.error = function blueslip_error (msg, more_info) {
if (page_params.debug_mode) { if (page_params.debug_mode) {
throw new BlueslipError(msg, more_info); throw new BlueslipError(msg, more_info);
} else { } else {
console.error(msg); var args = build_arg_list(msg, more_info);
if (more_info !== undefined) { console.error.apply(console, args);
console.error("Additional information: ", more_info);
}
report_error(msg, Error().stack, {more_info: more_info}); report_error(msg, Error().stack, {more_info: more_info});
} }
}; };