Skip to content

Commit

Permalink
v3.21.2
Browse files Browse the repository at this point in the history
  • Loading branch information
rjrodger committed May 26, 2020
1 parent a24264b commit 06bd457
Show file tree
Hide file tree
Showing 5 changed files with 1,052 additions and 982 deletions.
4 changes: 3 additions & 1 deletion lib/inward.js
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,9 @@ intern.explain = function (meta, entry) {
}
}

explain.push(entry && 'object' === typeof entry ? entry : { content: entry })
explain.push(
entry && 'object' === typeof entry ? entry : { content: entry }
)
}
}

Expand Down
14 changes: 11 additions & 3 deletions lib/logging.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ function flat_logger(entry) {
var data_fmt = new Array(data_src.length)
for (var i = 0; i < data_src.length; i++) {
data_fmt[i] =
data_src[i] && 'object' === typeof data_src[i] ? Common.clean(data_src[i]) : data_src[i]
data_src[i] && 'object' === typeof data_src[i]
? Common.clean(data_src[i])
: data_src[i]
data_fmt[i] = Util.inspect(data_fmt[i], {
compact: true,
depth: entry.depth$ || 3,
Expand Down Expand Up @@ -170,7 +172,9 @@ function build_log_spec(self) {
// Canonize logspec into a standard object structure
var logspec = Common.deep(
{ text_level: {} },
orig_logspec && 'object' === typeof orig_logspec ? orig_logspec : default_logspec
orig_logspec && 'object' === typeof orig_logspec
? orig_logspec
: default_logspec
)

// Define reverse lookup of log level values by name
Expand Down Expand Up @@ -220,7 +224,11 @@ function build_log_spec(self) {
logspec.level = parseInt(orig_logspec, 10)
} else if ('function' === typeof orig_logspec) {
logger = orig_logspec
} else if (orig_logspec && 'object' !== typeof orig_logspec && null != orig_logspec) {
} else if (
orig_logspec &&
'object' !== typeof orig_logspec &&
null != orig_logspec
) {
throw Common.error('bad_logspec', { logspec: orig_logspec })
}

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "seneca",
"description": "A Microservices Framework for Node.js",
"version": "3.21.1",
"version": "3.21.2",
"license": "MIT",
"homepage": "http://senecajs.org",
"keywords": [
Expand Down
Loading

0 comments on commit 06bd457

Please sign in to comment.