Commit 862b52a4 authored by Sourav Dey's avatar Sourav Dey
Browse files

Issue #SB-9277 feat: Adding logs

parent 301c563e
master dependabot/npm_and_yarn/src/async-2.6.4 dependabot/npm_and_yarn/src/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/flat-and-mocha-5.0.2 dependabot/npm_and_yarn/src/handlebars-4.7.7 dependabot/npm_and_yarn/src/jsonwebtoken-9.0.0 dependabot/npm_and_yarn/src/lodash-4.17.21 dependabot/npm_and_yarn/src/minimist-and-project-sunbird/telemetry-sdk-and-handlebars-and-mkdirp-1.2.8 release-3.6.0 release-4.3.0 release-4.8.0 release-5.2.0 release-5.3.0 release-5.6.0 release-6.0.0 v1.13.3 v1.13 v1.12 tmp-testPR tmp-sunbird-bootcamp tmp-rjshrjndrn-patch-1 tmp-revert-118-testPR tmp-revert-110-logs tmp-revert-99-revert-98-revert-97-revert-96-rjshrjndrn-patch-1 tmp-revert-98-revert-97-revert-96-rjshrjndrn-patch-1 tmp-revert-97-revert-96-rjshrjndrn-patch-1 tmp-revert-96-rjshrjndrn-patch-1 tmp-release-sonarcloud tmp-release-2.6.0 tmp-release-2.3.0 tmp-release-2.1.1 tmp-release-2.1.0 tmp-release-2.1.0_pluginSearch tmp-release-2.0.0 tmp-release-1.15 tmp-release-1.14.3 tmp-release-1.14 tmp-release-1.14-sp3 tmp-refactored-dev-deploy tmp-master tmp-loadtest tmp-load-testing tmp-jenkins-test tmp-jenkins-pipeline tmp-final-variable-refac tmp-dial-assemble-api tmp-content-update-read tmp-circleci release-5.6.0_RC1 release-5.2.0_RC1 release-4.8.5_RC1 release-4.8.0_RC2 release-4.8.0_RC1 release-4.3.0_RC1 release-3.8.0_RC3 release-3.8.0_RC2 release-3.8.0_RC1 release-3.7.0_RC2 release-3.7.0_RC1 release-3.6.0_RC1 release-3.2.0_RC2 release-3.2.0_RC1 release-3.1.0 release-3.1.0_RC2 release-3.1.0_RC1 release-3.0.1_RC1 release-3.0.0 release-3.0.0_RC1 release-2.10.0 release-2.10.0_RC2 release-2.10.0_RC1 release-2.9.0_RC3 release-2.9.0_RC2 release-2.9.0_RC1 release-2.8.0 release-2.8.0_RC4 release-2.8.0_RC3 release-2.8.0_RC2 release-2.8.0_RC1 release-2.7.0 release-2.7.0_RC2 release-2.7.0_RC1 release-2.6.0 release-2.6.0_RC4 release-2.6.0_RC3 release-2.6.0_RC2 release-2.6.0_RC1 release-2.3.0 release-2.3.0_RC2 release-2.3.0_RC1 release-2.1.1_RC1 release-2.1.0_RC2 release-2.1.0_RC1 release-2.0.0 release-2.0.0_RC5 release-2.0.0_RC4 release-2.0.0_RC3 release-2.0.0_RC2 release-2.0.0_RC1 release-1.15.0 release-1.15_RC7 release-1.15_RC6 release-1.15_RC5 release-1.15_RC4 release-1.15_RC3 release-1.15_RC2 release-1.15_RC1 release-1.14.0
No related merge requests found
Showing with 31 additions and 21 deletions
+31 -21
......@@ -196,6 +196,26 @@ module.exports = function (app) {
})
)
app
.route(
'/action' + configUtil.getConfig('RESERVE_DIALCODE') + '/:contentId'
)
.post(
requestMiddleware.createAndValidateRequestBody,
requestMiddleware.validateToken,
dialCodeService.reserveDialCode
)
app
.route(
'/action' + configUtil.getConfig('RELEASE_DIALCODE') + '/:contentId'
)
.patch(
requestMiddleware.createAndValidateRequestBody,
requestMiddleware.validateToken,
dialCodeService.releaseDialCode
)
app.use(
'/action/dialcode/*',
proxy(dialRepoBaseUrl, {
......@@ -302,24 +322,4 @@ module.exports = function (app) {
requestMiddleware.apiAccessForCreatorUser,
collaboratorService.updateCollaborators
)
app
.route(
'/action' + configUtil.getConfig('RESERVE_DIALCODE') + '/:contentId'
)
.post(
requestMiddleware.createAndValidateRequestBody,
requestMiddleware.validateToken,
dialCodeService.reserveDialCode
)
app
.route(
'/action' + configUtil.getConfig('RELEASE_DIALCODE') + '/:contentId'
)
.patch(
requestMiddleware.createAndValidateRequestBody,
requestMiddleware.validateToken,
dialCodeService.releaseDialCode
)
}
......@@ -758,15 +758,21 @@ function reserveDialCode (req, response) {
var data = req.body
var rspObj = req.rspObj
LOG.info(utilsService.getLoggerData(rspObj, 'INFO', filename, 'reserveDialCode',
'Came in reserveDialcode API'))
async.waterfall([
function (CBW) {
contentProvider.reserveDialcode(req.params.contentId, data, req.headers, function (err, res) {
if (err || res.responseCode !== responseCode.SUCCESS) {
LOG.error(utilsService.getLoggerData(rspObj, 'ERROR', filename, 'reserveDialCode',
'Error while fetching data from reserve dialcode API', 'err = ' + err + ', res = ' + res))
rspObj.errCode = res && res.params ? res.params.err : dialCodeMessage.RELEASE.FAILED_CODE
rspObj.errMsg = res && res.params ? res.params.errmsg : dialCodeMessage.RELEASE.FAILED_MESSAGE
rspObj.responseCode = res && res.responseCode ? res.responseCode : responseCode.CLIENT_ERROR
var httpStatus = res && res.statusCode >= 100 && res.statusCode < 600 ? res.statusCode : 500
if (res && res.result) rspObj.result = res.result
return response.status(httpStatus).send(respUtil.errorResponse(rspObj))
} else {
CBW(null, res)
......@@ -788,7 +794,7 @@ function reserveDialCode (req, response) {
batchImageService.createRequest(res.result.reservedDialcodes, channel, requestObj.publisher, rspObj,
function (err, processId) {
if (err) {
LOG.error(utilsService.getLoggerData(rspObj, 'ERROR', filename, 'generateDialCodeAPI',
LOG.error(utilsService.getLoggerData(rspObj, 'ERROR', filename, 'reserveDialCode',
'Error while creating request to child process for images creation', err))
res.responseCode = responseCode.PARTIAL_SUCCESS
return response.status(207).send(respUtil.successResponse(res))
......@@ -811,12 +817,16 @@ function reserveDialCode (req, response) {
function releaseDialCode (req, response) {
var data = req.body
var rspObj = req.rspObj
LOG.info(utilsService.getLoggerData(rspObj, 'INFO', filename, 'releaseDialCode',
'Came in releaseDialcode API'))
async.waterfall([
function (CBW) {
contentProvider.releaseDialcode(req.params.contentId, data, req.headers, function (err, res) {
if (err || res.responseCode !== responseCode.SUCCESS) {
LOG.error(utilsService.getLoggerData(rspObj, 'ERROR', filename, 'releaseDialCode',
'Error while fetching release dial code API', 'err = ' + err + ', res = ' + res))
rspObj.errCode = res && res.params ? res.params.err : dialCodeMessage.RELEASE.FAILED_CODE
rspObj.errMsg = res && res.params ? res.params.errmsg : dialCodeMessage.RELEASE.FAILED_MESSAGE
rspObj.responseCode = res && res.responseCode ? res.responseCode : responseCode.CLIENT_ERROR
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment