Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ install_deploysuite: &install_deploysuite
git clone --branch v1.3 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
cp ./../buildscript/master_deploy.sh .
cp ./../buildscript/buildenv.sh .
cp ./../buildscript/awsconfiguration.sh .

cp ./../buildscript/awsconfiguration.sh .

maven_configuration_v1: &maven_configuration_v1
name: Configuring maven
command: |
sudo sed -i '/<mirror>/,/<\/mirror>/d' /opt/apache-maven/conf/settings.xml

build_steps: &build_steps
# Initialization1.
- checkout
Expand All @@ -23,7 +28,8 @@ build_steps: &build_steps
sudo apt update
sudo apt install jq
sudo apt install awscli
- setup_remote_docker
- setup_remote_docker
- run: *maven_configuration_v1
- restore_cache:
key: ap-review-microservice-{{ checksum "~/project/service/pom.xml" }}
- run: mvn -f ~/project/service/pom.xml dependency:go-offline
Expand Down Expand Up @@ -88,12 +94,12 @@ workflows:
branches:
only:
- dev
- dev-msinteg
- feature/jira-plat-130
- dev-ecs
- "build-prod":
context : org-global
filters:
branches:
only:
- master
- master-ecs
- master-ecs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,11 @@ public ScoreManager() throws SupplyException {
ReviewItemDAO.class);
this.scoreDAO = DAOFactory.getInstance().createDAO(ScoreDAO.class);
this.projectResultDAO = DAOFactory.getInstance().createDAO(ProjectResultDAO.class);
this.eventProducer = EventProducer.getInstance();
/**
//jira-plat-130, hard cut the legacy publishing
this.eventProducer = EventProducer.getInstance();
*/
this.eventProducer = null;
}

/**
Expand Down Expand Up @@ -356,7 +360,13 @@ public void updateScores(List<ReviewItem> reviewItems, AuthUser auth) throws Exc
private void publishKafkaEvent(JsonNode json, String topic) {
// fire an event on to the kafka bus
try {
eventProducer.publish(topic, json);
if (eventProducer != null) {
eventProducer.publish(topic, json);
} else {
// jira-plat-130, hard cut the leagacy kafka

logger.info("jira-plat-130, hard cut the legacy publishing for topic: " + topic);
}
} catch (EmptyEventException e) {
logger.info("Failed to publish message " + e.getMessage());
} catch (EncodingEventException e) {
Expand Down