From 006c1dfd788a5cdff37892f9c785dcc91c6dbc94 Mon Sep 17 00:00:00 2001 From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com> Date: Mon, 6 Jul 2020 15:55:04 +0530 Subject: [PATCH 1/2] [skip ci] --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 53fb8a2..f0e269d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -82,11 +82,11 @@ build_steps: &build_steps #./master_deploy.sh -d ECS -e ${DEPLOY_ENV} -t latest -s ${GLOBAL_ENV}-global-appvar,${LOGICAL_ENV}-${APP_NAME}-appvar -i postgres-ifx-processer - echo "Running Masterscript - deploy postgres-ifx-processer reconsiler1" - if [ -e ${LOGICAL_ENV}-${APP_NAME}-reconsiler1-deployvar.json ]; then sudo rm -vf ${LOGICAL_ENV}-${APP_NAME}-reconsiler1-deployvar.json; fi - ./buildenv.sh -e ${DEPLOY_ENV} -b ${LOGICAL_ENV}-${APP_NAME}-reconsiler1-deployvar - source buildenvvar - ./master_deploy.sh -d ECS -e ${DEPLOY_ENV} -t latest -s ${GLOBAL_ENV}-global-appvar,${LOGICAL_ENV}-${APP_NAME}-appvar -i postgres-ifx-processer + #echo "Running Masterscript - deploy postgres-ifx-processer reconsiler1" + #if [ -e ${LOGICAL_ENV}-${APP_NAME}-reconsiler1-deployvar.json ]; then sudo rm -vf ${LOGICAL_ENV}-${APP_NAME}-reconsiler1-deployvar.json; fi + #./buildenv.sh -e ${DEPLOY_ENV} -b ${LOGICAL_ENV}-${APP_NAME}-reconsiler1-deployvar + #source buildenvvar + #./master_deploy.sh -d ECS -e ${DEPLOY_ENV} -t latest -s ${GLOBAL_ENV}-global-appvar,${LOGICAL_ENV}-${APP_NAME}-appvar -i postgres-ifx-processer #echo "Running Masterscript - deploy postgres-ifx-processer reconsiler2" #if [ -e ${LOGICAL_ENV}-${APP_NAME}-reconsiler2-deployvar.json ]; then sudo rm -vf ${LOGICAL_ENV}-${APP_NAME}-reconsiler1-deployvar.json; fi From 64e1a3bd7d4593cb7dba43c0122ce19b10159b2c Mon Sep 17 00:00:00 2001 From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com> Date: Mon, 6 Jul 2020 15:56:44 +0530 Subject: [PATCH 2/2] carriage return fix --- src/services/updateInformix.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/services/updateInformix.js b/src/services/updateInformix.js index 8a798a8..0e4e86d 100644 --- a/src/services/updateInformix.js +++ b/src/services/updateInformix.js @@ -3,7 +3,8 @@ const informix = require('../common/informixWrapper') const logger = require('../common/logger') String.prototype.escapeSpecialChars = function () { - return this.replace(/\n/g, "\\n"); + return this.replace(/\n/g, "\\n") + .replace(/\r/g, "\\r"); }; async function updateInformix(payload) {