From f55c676cec415b0cac273aaeb8640f654edf1744 Mon Sep 17 00:00:00 2001 From: Elad Laor Date: Thu, 23 Dec 2021 08:53:40 +0200 Subject: [PATCH] CR-7645-8 (#84) * bumped task-logger * bump in package.json * yarn * yarn --- lib/index.js | 6 ++++-- package.json | 6 +++--- service.yaml | 2 +- yarn.lock | 8 ++++---- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/index.js b/lib/index.js index f0508d8..f915c24 100644 --- a/lib/index.js +++ b/lib/index.js @@ -1,4 +1,4 @@ -const path = require('path'); +const path = require('path'); const cflogs = require('cf-logs'); const Q = require('q'); @@ -17,9 +17,11 @@ const Logger = require('./logger'); const buildFinishedPromise = Q.defer(); +const taskLoggerConfig = JSON.parse(process.env.TASK_LOGGER_CONFIG); + const logger = new Logger({ loggerId: process.env.LOGGER_ID, - taskLoggerConfig: JSON.parse(process.env.TASK_LOGGER_CONFIG), + taskLoggerConfig, findExistingContainers: process.env.LISTEN_ON_EXISTING, logSizeLimit: process.env.LOG_SIZE_LIMIT ? (parseInt(process.env.LOG_SIZE_LIMIT, 10) * 1000000) : undefined, buildFinishedPromise: buildFinishedPromise.promise, diff --git a/package.json b/package.json index 9885a0b..add95f8 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "cf-container-logger" ], "dependencies": { - "@codefresh-io/task-logger": "^1.9.18", + "@codefresh-io/task-logger": "^1.9.22", "body-parser": "^1.19.0", "cf-errors": "^0.1.15", "cf-logs": "^1.1.0", @@ -52,7 +52,7 @@ "lint-fix": "eslint '*/**/*.js' --fix", "test": "node ./node_modules/mocha/bin/_mocha './{,!(node_modules)/**/}*.spec.js' --exit", "test:ci": "yarn test", - "start": "node server/index.js", + "start": "node lib/index.js", "version": "exit 0" } -} \ No newline at end of file +} diff --git a/service.yaml b/service.yaml index 3edec6d..9712804 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 1.5.8 +version: 1.5.9 diff --git a/yarn.lock b/yarn.lock index 87ce039..2088aac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -38,10 +38,10 @@ dependencies: regenerator-runtime "^0.13.4" -"@codefresh-io/task-logger@^1.9.18": - version "1.9.18" - resolved "https://registry.yarnpkg.com/@codefresh-io/task-logger/-/task-logger-1.9.18.tgz#219babad0fe29d21f53fb41af07835ed872b092e" - integrity sha512-p1XV3ubqvJ/5foC3Ypf/8bwbcQSxAPV1jCHuHld4O2aigu12sHHMw4yXZVp0WcR3o9qeXNiQxzFYClVYMBhj/w== +"@codefresh-io/task-logger@^1.9.22": + version "1.9.22" + resolved "https://registry.yarnpkg.com/@codefresh-io/task-logger/-/task-logger-1.9.22.tgz#57b374558a1f350b990bb2a8c18e88e785c9b4f8" + integrity sha512-4tSJC3GiFH1HA3kfyht7m+AbGro4dx0QrY/nmIxnt/0jD6NK9F87dwgQx9j8q+pE51Le2OKA0WWyPk/s2tywcg== dependencies: cf-errors "^0.1.16" debug "^4.1.1"