Skip to content

Commit cbf49a9

Browse files
Gunasekar-KGunasekar-K
authored
Merge pull request #13 from topcoder-platform/dev-reconciler-fix-v1
reconciler fix v1 [skip ci]
2 parents 8fb3856 + f545ae2 commit cbf49a9

14 files changed

+1716
-457
lines changed

‎.circleci/config.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,28 +44,27 @@ builddeploy_steps: &builddeploy_steps
4444
# # notify deployment
4545
# rm -rf buildenvvar
4646
# ./unsetenv.sh
47-
# ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-notify-deployvar
48-
# source buildenvvar
49-
# ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-notify-appvar -i ${APPNAME}
47+
./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-notify-deployvar
48+
source buildenvvar
49+
./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-notify-appvar -i ${APPNAME}
5050
# # consumer deployment
5151
# rm -rf buildenvvar
5252
# ./unsetenv.sh
53-
./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-consumer-deployvar
54-
source buildenvvar
55-
./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
53+
# ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-consumer-deployvar
54+
# source buildenvvar
55+
# ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
5656
# # without kafka dynamodb
5757
# rm -rf buildenvvar
5858
# ./unsetenv.sh
5959
# ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-withoutkafka-deployvar
6060
# source buildenvvar
61-
# ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-${APPNAME}-withoutkafka-appvar -i ${APPNAME}
61+
# ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-${APPNAME}-appvar,${LOGICAL_ENV}-${APPNAME}-withoutkafka-appvar -i ${APPNAME}
6262
# # reconciler deployment
6363
# rm -rf buildenvvar
6464
# ./unsetenv.sh
6565
# ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-reconciler-deployvar
6666
# source buildenvvar
67-
# ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
68-
67+
# ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-${APPNAME}-appvar,${LOGICAL_ENV}-${APPNAME}-withoutkafka-appvar -i ${APPNAME}
6968
7069
7170
jobs:
@@ -97,8 +96,7 @@ workflows:
9796
branches:
9897
only:
9998
- dev
100-
- dev-chr-fix
101-
- dev-spl-chr-fix
99+
- dev-reconciler-fix-v1
102100

103101
# Production builds are exectuted only on tagged commits to the
104102
# master branch.

‎config/default.js

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,26 @@ module.exports = {
6666
},
6767
RECONCILER :
6868
{
69+
// Dynamodb configuration
6970
RECONCILER_ELAPSE_TIME : parseInt(process.env.RECONCILER_ELAPSE_TIME || 600000),
70-
RECONCILER_IGNORE_STATUS : process.env.RECONCILER_IGNORE_STATUS || 'PostgresUpdated',
71-
RECONCILER_START_ELAPSE_TIME : parseInt(process.env.RECONCILER_START_ELAPSE_TIME || 1),
72-
RECONCILER_DIFF_PERIOD : parseInt(process.env.RECONCILER_DIFF_PERIOD || 10),
73-
RECONCILER_DURATION_TYPE : process.env.RECONCILER_DURATION_TYPE || 'm',
71+
RECONCILER_DYNAMO_START_ELAPSE_TIME : parseInt(process.env.RECONCILER_DYNAMO_START_ELAPSE_TIME || 1),
72+
RECONCILER_DYNAMO_DIFF_PERIOD : parseInt(process.env.RECONCILER_DYNAMO_DIFF_PERIOD || 10),
73+
RECONCILER_DYNAMO_DURATION_TYPE : process.env.RECONCILER_DYNAMO_DURATION_TYPE || 'm',
74+
//PG Configuration
75+
RECONCILER_PG_IGNORE_STATUS : process.env.RECONCILER_PG_IGNORE_STATUS || 'PostgresUpdated',
76+
RECONCILER_PG_START_ELAPSE_TIME : parseInt(process.env.RECONCILER_PG_START_ELAPSE_TIME || 1),
77+
RECONCILER_PG_DIFF_PERIOD : parseInt(process.env.RECONCILER_PG_DIFF_PERIOD || 10),
78+
RECONCILER_PG_DURATION_TYPE : process.env.RECONCILER_PG_DURATION_TYPE || 'm',
79+
//General Configuration
7480
RECONCILER_RETRY_COUNT : parseInt(process.env.RECONCILER_RETRY_COUNT || 1),
75-
RECONCILER_POST_URL : process.env.RECONCILER_POST_URL || 'http://ifxpg-migrator.topcoder-dev.com/kafkaevents'
76-
}
81+
RECONCILER_POST_URL : process.env.RECONCILER_POST_URL || 'http://ifxpg-migrator.topcoder-dev.com/kafkaevents',
82+
RECONCILE_DYNAMODB : process.env.RECONCILE_DYNAMODB || 'true',
83+
RECONCILE_PGSTATUS : process.env.RECONCILE_PGSTATUS || 'true',
84+
RECONCILE_TIMESCHEDULE : process.env.RECONCILE_TIMESCHEDULE || '*/3 * * * *'
85+
},
86+
AUDITLOG: {
87+
AUDITLOG_DBNAME: process.env.AUDITLOG_DBNAME || 'auditlog',
88+
AUDITLOG_DYNAMO_TABLENAME: process.env.AUDITLOG_DYNAMO_TABLENAME || 'dynamodb_audit_log',
89+
AUDITLOG_PG_TABLENAME: process.env.AUDITLOG_PG_TABLENAME || 'audit_log'
90+
}
7791
}

0 commit comments

Comments
 (0)