这是indexloc提供的服务，不要输入任何密码
Skip to content

Release version to master #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 18, 2023
Merged

Release version to master #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f7729c6
Improve error handling for internal calls
ZIMkaRU Jan 12, 2023
808ca0c
Dont be logged to std error stream when making internal call
ZIMkaRU Jan 12, 2023
38cce81
Merge pull request #278 from ZIMkaRU/feature/improve-error-handling
prdn Jan 16, 2023
7230a35
Bump version up to 4.0.5
ZIMkaRU Jan 18, 2023
4068a8c
Merge pull request #279 from ZIMkaRU/feature/release-version
prdn Jan 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bfx-report",
"version": "4.0.4",
"version": "4.0.5",
"description": "Reporting tool",
"main": "worker.js",
"license": "Apache-2.0",
Expand Down
7 changes: 7 additions & 0 deletions workers/loc.api/helpers/get-data-from-api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,13 @@ module.exports = (
try {
const _args = cloneDeep(args)

/*
* API request should not be logged to std error stream
* when making an internal call and can have some attempts
* due to an internet connection issue
*/
_args.shouldNotBeLoggedToStdErrorStream = true

if (
typeof getData === 'string' &&
typeof middleware === 'function'
Expand Down
37 changes: 29 additions & 8 deletions workers/loc.api/responder/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,26 @@ const _getErrorMetadata = (args, err) => {
return { code, message, data, error }
}

const _logError = (logger, args, err, name) => {
const _logError = (loggerArgs, err) => {
const {
logger,
args,
name,
isInternalRequest
} = loggerArgs ?? {}
const shouldNotBeLoggedToStdErrorStream = (
isInternalRequest &&
!!args?.shouldNotBeLoggedToStdErrorStream
)
const {
code,
error
} = _getErrorMetadata(args, err)

if (code !== 500) {
if (
code !== 500 ||
shouldNotBeLoggedToStdErrorStream
) {
logger.debug(_prepareErrorData(error, name))

return
Expand Down Expand Up @@ -176,14 +189,22 @@ module.exports = (
args,
cb
) => {
const isInternalRequest = !cb
const loggerArgs = {
logger,
args,
name,
isInternalRequest
}

try {
const resFn = handler(container, args)

if (resFn instanceof Promise) {
if (!cb) {
if (isInternalRequest) {
return resFn
.catch((err) => {
_logError(logger, args, err, name)
_logError(loggerArgs, err)

return Promise.reject(err)
})
Expand All @@ -192,20 +213,20 @@ module.exports = (
resFn
.then((res) => cb(null, _makeJsonRpcResponse(args, res)))
.catch((err) => {
_logError(logger, args, err, name)
_logError(loggerArgs, err)

cb(null, _makeJsonRpcResponse(args, err))
})

return
}

if (!cb) return resFn
if (isInternalRequest) return resFn
cb(null, _makeJsonRpcResponse(args, resFn))
} catch (err) {
_logError(logger, args, err, name)
_logError(loggerArgs, err)

if (!cb) throw err
if (isInternalRequest) throw err
cb(null, _makeJsonRpcResponse(args, err))
}
}