diff --git a/.circleci/config.yml b/.circleci/config.yml index 0d7d4ee..1647bf6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -67,6 +67,7 @@ workflows: branches: only: - develop + - pm-2539 # Production builds are exectuted only on tagged commits to the # master branch. diff --git a/config/default.js b/config/default.js index d4ea797..e3b872f 100644 --- a/config/default.js +++ b/config/default.js @@ -121,5 +121,6 @@ module.exports = { HASHING_KEYS: { USERFLOW: process.env.USERFLOW_PRIVATE_KEY - } + }, + MEMBER_SERVICE_PRISMA_TIMEOUT: process.env.MEMBER_SERVICE_PRISMA_TIMEOUT ? parseInt(process.env.MEMBER_SERVICE_PRISMA_TIMEOUT, 10) : 10000, } diff --git a/src/common/prisma.js b/src/common/prisma.js index 50f8fa1..ca758cc 100644 --- a/src/common/prisma.js +++ b/src/common/prisma.js @@ -4,8 +4,12 @@ const { Prisma } = require('../../prisma/generated/client') const { PrismaClient: SkillsPrismaClient } = require('../../prisma/generated/skills-client') +const config = require('config') const clientOptions = { + transactionOptions: { + timeout: config.MEMBER_SERVICE_PRISMA_TIMEOUT, + }, log: [ { level: 'query', emit: 'event' }, { level: 'info', emit: 'event' },