Merge pull request #16 from topcoder-platform/dev

Renciler fix v1

Author: Gunasekar-K

.circleci/config.yml

@@ -44,28 +44,27 @@ builddeploy_steps: &builddeploy_steps
             # # notify deployment
             # rm -rf buildenvvar
             # ./unsetenv.sh            
-            # ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-notify-deployvar
-            # source buildenvvar            
-            # ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-notify-appvar -i ${APPNAME}            
+            ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-notify-deployvar
+            source buildenvvar            
+            ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-notify-appvar -i ${APPNAME}            
             # # consumer deployment
             # rm -rf buildenvvar
             # ./unsetenv.sh
-            ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-consumer-deployvar
-            source buildenvvar            
-            ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
+            # ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-consumer-deployvar
+            # source buildenvvar            
+            # ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
             # # without kafka dynamodb
             # rm -rf buildenvvar
             # ./unsetenv.sh
             # ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-withoutkafka-deployvar
             # source buildenvvar            
-            # ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-${APPNAME}-withoutkafka-appvar -i ${APPNAME}
+            # ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-${APPNAME}-appvar,${LOGICAL_ENV}-${APPNAME}-withoutkafka-appvar -i ${APPNAME}
             # # reconciler deployment
             # rm -rf buildenvvar
             # ./unsetenv.sh            
             # ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-reconciler-deployvar
             # source buildenvvar
-            # ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
-
+            # ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-${APPNAME}-appvar,${LOGICAL_ENV}-${APPNAME}-withoutkafka-appvar -i ${APPNAME}
 
 
 jobs:
@@ -97,8 +96,7 @@ workflows:
             branches:
               only:
                 - dev
-                - dev-chr-fix
-                - dev-spl-chr-fix
+                - dev-reconciler-fix-v1
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.

config/default.js

@@ -66,12 +66,26 @@ module.exports = {
   },
   RECONCILER : 
   {
+    // Dynamodb configuration
     RECONCILER_ELAPSE_TIME : parseInt(process.env.RECONCILER_ELAPSE_TIME || 600000),
-    RECONCILER_IGNORE_STATUS :  process.env.RECONCILER_IGNORE_STATUS || 'PostgresUpdated',
-    RECONCILER_START_ELAPSE_TIME : parseInt(process.env.RECONCILER_START_ELAPSE_TIME || 1),
-    RECONCILER_DIFF_PERIOD : parseInt(process.env.RECONCILER_DIFF_PERIOD || 10),
-    RECONCILER_DURATION_TYPE : process.env.RECONCILER_DURATION_TYPE || 'm',
+    RECONCILER_DYNAMO_START_ELAPSE_TIME : parseInt(process.env.RECONCILER_DYNAMO_START_ELAPSE_TIME || 1),
+    RECONCILER_DYNAMO_DIFF_PERIOD : parseInt(process.env.RECONCILER_DYNAMO_DIFF_PERIOD || 10),
+    RECONCILER_DYNAMO_DURATION_TYPE : process.env.RECONCILER_DYNAMO_DURATION_TYPE || 'm',
+    //PG Configuration
+    RECONCILER_PG_IGNORE_STATUS :  process.env.RECONCILER_PG_IGNORE_STATUS || 'PostgresUpdated',
+    RECONCILER_PG_START_ELAPSE_TIME : parseInt(process.env.RECONCILER_PG_START_ELAPSE_TIME || 1),
+    RECONCILER_PG_DIFF_PERIOD : parseInt(process.env.RECONCILER_PG_DIFF_PERIOD || 10),
+    RECONCILER_PG_DURATION_TYPE : process.env.RECONCILER_PG_DURATION_TYPE || 'm',
+    //General Configuration
     RECONCILER_RETRY_COUNT : parseInt(process.env.RECONCILER_RETRY_COUNT || 1),
-    RECONCILER_POST_URL : process.env.RECONCILER_POST_URL || 'http://ifxpg-migrator.topcoder-dev.com/kafkaevents'
-  }  
+    RECONCILER_POST_URL : process.env.RECONCILER_POST_URL || 'http://ifxpg-migrator.topcoder-dev.com/kafkaevents',
+    RECONCILE_DYNAMODB : process.env.RECONCILE_DYNAMODB || 'true',
+    RECONCILE_PGSTATUS : process.env.RECONCILE_PGSTATUS || 'true',
+    RECONCILE_TIMESCHEDULE : process.env.RECONCILE_TIMESCHEDULE || '*/3 * * * *'
+  },
+  AUDITLOG: {
+    AUDITLOG_DBNAME: process.env.AUDITLOG_DBNAME || 'auditlog',
+    AUDITLOG_DYNAMO_TABLENAME: process.env.AUDITLOG_DYNAMO_TABLENAME || 'dynamodb_audit_log',  
+    AUDITLOG_PG_TABLENAME: process.env.AUDITLOG_PG_TABLENAME || 'audit_log'
+  } 
 }