Skip to content

Commit 40520c2

Browse files
author
vikasrohit
authored
Merge pull request topcoder-platform#81 from topcoder-platform/feature/db-lock-issue
Feature/db lock issue
2 parents 476a492 + 52e70b0 commit 40520c2

File tree

4 files changed

+16
-2
lines changed

4 files changed

+16
-2
lines changed

Dockerfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@ FROM node:6.9.4
22
LABEL version="1.0"
33
LABEL description="Projects microservice"
44

5+
RUN apt-get update && \
6+
apt-get upgrade -y
7+
8+
# install aws
9+
RUN apt-get install -y \
10+
ssh \
11+
python \
12+
python-dev \
13+
python-pip
14+
15+
RUN pip install awscli
16+
517
RUN apt-get install libpq-dev
618
# Create app directory
719
RUN mkdir -p /usr/src/app

src/routes/projects/create.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ module.exports = [
125125
status: PROJECT_STATUS.DRAFT,
126126
cancelReason: null,
127127
updatedBy: req.authUser.userId,
128-
});
128+
}).then(() => req.log.debug('project history created for project %d', newProject.id))
129+
.catch(() => req.log.error('project history failed for project %d', newProject.id));
129130
req.log.debug('creating direct project for project %d', newProject.id);
130131
return directProject.createDirectProject(req, body)
131132
.then((resp) => {

src/services/busApi.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function getClient() {
4242
function createEvent(type, message, logger) {
4343
const body = JSON.stringify(message);
4444
logger.debug(`Sending message: ${JSON.stringify(message)}`);
45-
return getClient().post('/v5/bus/events', {
45+
return getClient().post('/bus/events', {
4646
type,
4747
message: body,
4848
})

src/services/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ module.exports = (fapp, logger) => {
1818
if (process.env.NODE_ENV.toLowerCase() === 'test') {
1919
require('../tests/serviceMocks')(app); // eslint-disable-line global-require
2020
} else {
21+
logger.info('initializing RabbitMQ service');
2122
// RabbitMQ Initialization
2223
app.services.pubsub = new RabbitMQService(logger);
2324

0 commit comments

Comments
 (0)