Skip to content

Commit f994536

Browse files
committed
Reformat log to be JSON
1 parent cb974e7 commit f994536

File tree

2 files changed

+22
-8
lines changed

2 files changed

+22
-8
lines changed

lib/message_request.js

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ const Request = function (message) {
1212
this.message = message
1313

1414
if (!this._isValid()) {
15-
logger.error('invalid request. op: ' + this.message.op + '; to: ' + this.message.to)
15+
logger.error({
16+
message: `invalid request. op: ${this.message.op}; to: ${this.message.to}`
17+
})
1618
this.message = {}
1719
}
1820
}
@@ -134,7 +136,9 @@ Request.prototype._isValid = function () {
134136
return true
135137
}
136138
} else {
137-
logger.error('missing type')
139+
logger.error({
140+
message: 'missing type'
141+
})
138142
}
139143
return false
140144
}
@@ -146,15 +150,19 @@ Request.prototype._isValidType = function (type) {
146150
}
147151
}
148152
this.errMsg = 'invalid type: ' + type
149-
logger.error(this.errMsg)
153+
logger.error({
154+
message: this.errMsg
155+
})
150156
return false
151157
}
152158

153159
Request.prototype._isValidOperation = function (type, ops = opTable[type]) {
154160
const isValid = ops && ops.indexOf(this.message.op) >= 0
155161
if (!isValid) {
156-
this.errMsg = 'invalid operation: ' + this.message.op + ' for type: ' + type
157-
logger.error(this.errMsg)
162+
this.errMsg = 'invalid operation: ' + this.message.op + ' for type: ' + type;
163+
logger.error({
164+
message: this.errMsg
165+
})
158166
}
159167
return isValid
160168
}

lib/message_response.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ function Response (message) {
44
this.message = message
55

66
if (!this._validate()) {
7-
logger.error('invalid response. message: ' + JSON.stringify(message))
7+
logger.error({
8+
message: `invalid response. message: ${JSON.stringify(message)}`
9+
})
810
this.message = {}
911
}
1012
}
@@ -23,15 +25,19 @@ Response.prototype._validate = function () {
2325
case 'ack':
2426
if (!this.message.value) {
2527
this.errMsg = 'missing value'
26-
logger.error(this.errMsg)
28+
logger.error({
29+
message: this.errMsg
30+
})
2731
return false
2832
}
2933
break
3034

3135
default:
3236
if (this.message.op !== 'err' && !this.message.to) {
3337
this.errMsg = 'missing to'
34-
logger.error(this.errMsg)
38+
logger.error({
39+
message: this.errMsg
40+
})
3541
return false
3642
}
3743
}

0 commit comments

Comments
 (0)