From 078d650af9776a5392e7278b9fd4f63b674c1539 Mon Sep 17 00:00:00 2001 From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com> Date: Mon, 8 Apr 2019 16:37:07 +0530 Subject: [PATCH 1/6] cache updates --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7d6f412..6f8a693 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,9 +40,9 @@ jobs: - setup_remote_docker - run: *install_dependency - run: *install_deploysuite - # - restore_cache: *restore_cache_settings_for_build + - restore_cache: *restore_cache_settings_for_build - run: *run_build - # - save_cache: *save_cache_settings + - save_cache: *save_cache_settings - deploy: name: Running Masterscript - deploy tc-email-service command: | @@ -60,9 +60,9 @@ jobs: - setup_remote_docker - run: *install_dependency - run: *install_deploysuite - # - restore_cache: *restore_cache_settings_for_build + - restore_cache: *restore_cache_settings_for_build - run: *run_build - # - save_cache: *save_cache_settings + - save_cache: *save_cache_settings - deploy: name: Running Masterscript - prod deploy tc-email-service command: | From 4b7cf4e608a940cf55fc13cd596954f74e69df07 Mon Sep 17 00:00:00 2001 From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com> Date: Mon, 8 Apr 2019 16:45:09 +0530 Subject: [PATCH 2/6] Update config.yml --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6f8a693..186d87a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,6 +40,9 @@ jobs: - setup_remote_docker - run: *install_dependency - run: *install_deploysuite + - run: + name: give permission + command: chmod -R 777 root/project/ - restore_cache: *restore_cache_settings_for_build - run: *run_build - save_cache: *save_cache_settings From 2c0a249335182132d6d56ea6a689292ee316f666 Mon Sep 17 00:00:00 2001 From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com> Date: Mon, 8 Apr 2019 16:57:24 +0530 Subject: [PATCH 3/6] Update config.yml --- .circleci/config.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 186d87a..77218e0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,10 +40,7 @@ jobs: - setup_remote_docker - run: *install_dependency - run: *install_deploysuite - - run: - name: give permission - command: chmod -R 777 root/project/ - - restore_cache: *restore_cache_settings_for_build + # - restore_cache: *restore_cache_settings_for_build - run: *run_build - save_cache: *save_cache_settings - deploy: From df0db011b31a2919f2a31c92d5f387bf2b9a0370 Mon Sep 17 00:00:00 2001 From: nkumar-topcoder <33625707+nkumar-topcoder@users.noreply.github.com> Date: Mon, 8 Apr 2019 17:03:56 +0530 Subject: [PATCH 4/6] Update config.yml --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 77218e0..3479b2c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,10 +19,10 @@ install_deploysuite: &install_deploysuite cp ./../buildscript/awsconfiguration.sh . restore_cache_settings_for_build: &restore_cache_settings_for_build - key: docker-tc-email-service-{{ checksum "package-lock.json" }} + key: circleci-tc-email-service-{{ checksum "package-lock.json" }} save_cache_settings: &save_cache_settings - key: docker-tc-email-service-{{ checksum "package-lock.json" }} + key: circleci-tc-email-service-{{ checksum "package-lock.json" }} paths: - node_modules @@ -40,7 +40,7 @@ jobs: - setup_remote_docker - run: *install_dependency - run: *install_deploysuite - # - restore_cache: *restore_cache_settings_for_build + - restore_cache: *restore_cache_settings_for_build - run: *run_build - save_cache: *save_cache_settings - deploy: From 9051aabe9bcb810a0908a1c004c7ab0330363368 Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Wed, 24 Apr 2019 10:54:56 +0530 Subject: [PATCH 5/6] increasing max-bytes option for kafka consumer client --- config/default.js | 1 + src/app.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/default.js b/config/default.js index be5e4ee..daa623d 100644 --- a/config/default.js +++ b/config/default.js @@ -21,6 +21,7 @@ module.exports = { VALID_ISSUERS: process.env.VALID_ISSUERS, KAFKA_URL: process.env.KAFKA_URL, + KAFKA_MAXBYTES: process.env.MAXBYTES || 2097152 /** 2MB /*, KAFKA_GROUP_ID: process.env.KAFKA_GROUP_ID, KAFKA_CLIENT_CERT: process.env.KAFKA_CLIENT_CERT ? process.env.KAFKA_CLIENT_CERT.replace('\\n', '\n') : null, KAFKA_CLIENT_CERT_KEY: process.env.KAFKA_CLIENT_CERT_KEY ? diff --git a/src/app.js b/src/app.js index 3bc1563..97a0b1a 100644 --- a/src/app.js +++ b/src/app.js @@ -26,7 +26,7 @@ let emailTries = {}; */ function configureKafkaConsumer(handlers) { // create group consumer - const options = { groupId: config.KAFKA_GROUP_ID, connectionString: config.KAFKA_URL }; + const options = { groupId: config.KAFKA_GROUP_ID, connectionString: config.KAFKA_URL, maxBytes:config.KAFKA_MAXBYTES }; if (config.KAFKA_CLIENT_CERT && config.KAFKA_CLIENT_CERT_KEY) { options.ssl = { cert: config.KAFKA_CLIENT_CERT, key: config.KAFKA_CLIENT_CERT_KEY }; } From 6cd4127c0c4a943bf2735802a5e9661615515ef3 Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Wed, 24 Apr 2019 11:40:08 +0530 Subject: [PATCH 6/6] fixing inline comment issue. --- config/default.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/default.js b/config/default.js index daa623d..7a27aa0 100644 --- a/config/default.js +++ b/config/default.js @@ -21,7 +21,10 @@ module.exports = { VALID_ISSUERS: process.env.VALID_ISSUERS, KAFKA_URL: process.env.KAFKA_URL, - KAFKA_MAXBYTES: process.env.MAXBYTES || 2097152 /** 2MB /*, + + // max bytes 2MB + KAFKA_MAXBYTES: process.env.MAXBYTES || 2097152, + KAFKA_GROUP_ID: process.env.KAFKA_GROUP_ID, KAFKA_CLIENT_CERT: process.env.KAFKA_CLIENT_CERT ? process.env.KAFKA_CLIENT_CERT.replace('\\n', '\n') : null, KAFKA_CLIENT_CERT_KEY: process.env.KAFKA_CLIENT_CERT_KEY ?