Merge pull request #24 from topcoder-platform/dev

merge to master from dev

Author: nkumar-topcoder

.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

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) {