From cf003fd5939212cae424fbb71fe67d118a7adb58 Mon Sep 17 00:00:00 2001 From: Aaro Koivukangas Date: Fri, 14 Aug 2026 13:45:09 +0300 Subject: [PATCH] [Winston] Remove loggers to old server that will be deleted --- .../sis-updater-scheduler/package-lock.json | 131 ------------------ updater/sis-updater-scheduler/package.json | 1 - .../sis-updater-scheduler/src/utils/logger.js | 18 --- updater/sis-updater-worker/package-lock.json | 119 ---------------- updater/sis-updater-worker/package.json | 6 +- .../sis-updater-worker/src/utils/logger.js | 18 --- 6 files changed, 1 insertion(+), 292 deletions(-) diff --git a/updater/sis-updater-scheduler/package-lock.json b/updater/sis-updater-scheduler/package-lock.json index 10a26d733..9829d6b19 100644 --- a/updater/sis-updater-scheduler/package-lock.json +++ b/updater/sis-updater-scheduler/package-lock.json @@ -16,7 +16,6 @@ "pg": "^8.20.0", "redis": "^4.7.1", "winston": "^3.19.0", - "winston-gelf-transporter": "^1.0.2", "winston-loki": "^6.1.5", "winston-transport-sentry-node": "^3.0.0" }, @@ -1800,15 +1799,6 @@ "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", "license": "MIT" }, - "node_modules/colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", - "license": "MIT", - "engines": { - "node": ">=0.1.90" - } - }, "node_modules/commander": { "version": "10.0.1", "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", @@ -1854,12 +1844,6 @@ "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", "license": "MIT" }, - "node_modules/core-util-is": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", - "license": "MIT" - }, "node_modules/cron": { "version": "4.3.3", "resolved": "https://registry.npmjs.org/cron/-/cron-4.3.3.tgz", @@ -2085,12 +2069,6 @@ "express": "^4.16.2" } }, - "node_modules/fast-safe-stringify": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", - "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==", - "license": "MIT" - }, "node_modules/fecha": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", @@ -2183,15 +2161,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/gelf-pro": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/gelf-pro/-/gelf-pro-1.4.0.tgz", - "integrity": "sha512-VXQ1DHQjQr8/Xil83hHgozqeCcVrggGAA6A8hgjojQSatiF6PErR+nnYv/DCBxFBolO6licomD7Abaj0Iec7Qg==", - "license": "MIT", - "dependencies": { - "lodash": "~4.17.21" - } - }, "node_modules/generic-pool": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.9.0.tgz", @@ -2504,12 +2473,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "license": "MIT" - }, "node_modules/knex": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/knex/-/knex-3.3.0.tgz", @@ -2605,12 +2568,6 @@ "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==", "license": "MIT" }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "license": "MIT" - }, "node_modules/lodash-es": { "version": "4.17.23", "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.23.tgz", @@ -3091,12 +3048,6 @@ "node": ">=0.10.0" } }, - "node_modules/process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "license": "MIT" - }, "node_modules/protobufjs": { "version": "7.5.4", "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.4.tgz", @@ -3827,88 +3778,6 @@ "node": ">= 12.0.0" } }, - "node_modules/winston-gelf-transporter": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/winston-gelf-transporter/-/winston-gelf-transporter-1.0.2.tgz", - "integrity": "sha512-N1+D778Ju5q6u7jIKgwwyYsfND8SKhw4QLtUXAS83BYgkQvRtjvNs8PWS2oY4U4voPKh3U6DcjWkPtpfgKN5dw==", - "license": "MIT", - "dependencies": { - "gelf-pro": "1.3.3", - "logform": "2.1.2", - "winston-transport": "4.3.0" - }, - "engines": { - "node": ">= 8.x.x" - } - }, - "node_modules/winston-gelf-transporter/node_modules/fecha": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", - "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==", - "license": "MIT" - }, - "node_modules/winston-gelf-transporter/node_modules/logform": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz", - "integrity": "sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==", - "license": "MIT", - "dependencies": { - "colors": "^1.2.1", - "fast-safe-stringify": "^2.0.4", - "fecha": "^2.3.3", - "ms": "^2.1.1", - "triple-beam": "^1.3.0" - } - }, - "node_modules/winston-gelf-transporter/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" - }, - "node_modules/winston-gelf-transporter/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "license": "MIT", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/winston-gelf-transporter/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "license": "MIT" - }, - "node_modules/winston-gelf-transporter/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/winston-gelf-transporter/node_modules/winston-transport": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz", - "integrity": "sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==", - "license": "MIT", - "dependencies": { - "readable-stream": "^2.3.6", - "triple-beam": "^1.2.0" - }, - "engines": { - "node": ">= 6.4.0" - } - }, "node_modules/winston-loki": { "version": "6.1.5", "resolved": "https://registry.npmjs.org/winston-loki/-/winston-loki-6.1.5.tgz", diff --git a/updater/sis-updater-scheduler/package.json b/updater/sis-updater-scheduler/package.json index d88061910..5253f47ef 100644 --- a/updater/sis-updater-scheduler/package.json +++ b/updater/sis-updater-scheduler/package.json @@ -16,7 +16,6 @@ "pg": "^8.20.0", "redis": "^4.7.1", "winston": "^3.19.0", - "winston-gelf-transporter": "^1.0.2", "winston-loki": "^6.1.5", "winston-transport-sentry-node": "^3.0.0" }, diff --git a/updater/sis-updater-scheduler/src/utils/logger.js b/updater/sis-updater-scheduler/src/utils/logger.js index 672fc081d..183d97f0e 100644 --- a/updater/sis-updater-scheduler/src/utils/logger.js +++ b/updater/sis-updater-scheduler/src/utils/logger.js @@ -1,6 +1,4 @@ -const os = require('os') const winston = require('winston') -const { WinstonGelfTransporter } = require('winston-gelf-transporter') const LokiTransport = require('winston-loki') const Sentry = require('winston-transport-sentry-node').default @@ -45,22 +43,6 @@ transports.push( }) ) -if (isProduction && !isStaging) { - transports.push( - new WinstonGelfTransporter({ - handleExceptions: true, - host: 'svm-116.cs.helsinki.fi', - port: 9503, - protocol: 'udp', - hostName: os.hostname(), - additional: { - app: 'updater-scheduler', - environment: 'production', - }, - }) - ) -} - const logger = winston.createLogger({ transports }) logger.on('error', error => console.error('Logging failed! Reason: ', error)) // eslint-disable-line no-console diff --git a/updater/sis-updater-worker/package-lock.json b/updater/sis-updater-worker/package-lock.json index 80c5b572b..bc8badeec 100644 --- a/updater/sis-updater-worker/package-lock.json +++ b/updater/sis-updater-worker/package-lock.json @@ -16,7 +16,6 @@ "sequelize": "^6.37.8", "umzug": "^3.8.3", "winston": "^3.19.0", - "winston-gelf-transporter": "^1.0.2", "winston-loki": "^6.1.5", "winston-transport-sentry-node": "^3.0.0" }, @@ -1788,15 +1787,6 @@ "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", "license": "MIT" }, - "node_modules/colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", - "license": "MIT", - "engines": { - "node": ">=0.1.90" - } - }, "node_modules/commander": { "version": "10.0.1", "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", @@ -1806,12 +1796,6 @@ "node": ">=14" } }, - "node_modules/core-util-is": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", - "license": "MIT" - }, "node_modules/cron-parser": { "version": "4.9.0", "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz", @@ -1902,12 +1886,6 @@ "node": ">=6" } }, - "node_modules/fast-safe-stringify": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", - "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==", - "license": "MIT" - }, "node_modules/fecha": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", @@ -1978,15 +1956,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/gelf-pro": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/gelf-pro/-/gelf-pro-1.4.0.tgz", - "integrity": "sha512-VXQ1DHQjQr8/Xil83hHgozqeCcVrggGAA6A8hgjojQSatiF6PErR+nnYv/DCBxFBolO6licomD7Abaj0Iec7Qg==", - "license": "MIT", - "dependencies": { - "lodash": "~4.17.21" - } - }, "node_modules/generic-pool": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.9.0.tgz", @@ -2201,12 +2170,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "license": "MIT" - }, "node_modules/jju": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", @@ -2734,12 +2697,6 @@ "node": ">=0.10.0" } }, - "node_modules/process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "license": "MIT" - }, "node_modules/protobufjs": { "version": "7.5.4", "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.4.tgz", @@ -3375,82 +3332,6 @@ "node": ">= 12.0.0" } }, - "node_modules/winston-gelf-transporter": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/winston-gelf-transporter/-/winston-gelf-transporter-1.0.2.tgz", - "integrity": "sha512-N1+D778Ju5q6u7jIKgwwyYsfND8SKhw4QLtUXAS83BYgkQvRtjvNs8PWS2oY4U4voPKh3U6DcjWkPtpfgKN5dw==", - "license": "MIT", - "dependencies": { - "gelf-pro": "1.3.3", - "logform": "2.1.2", - "winston-transport": "4.3.0" - }, - "engines": { - "node": ">= 8.x.x" - } - }, - "node_modules/winston-gelf-transporter/node_modules/fecha": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", - "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==", - "license": "MIT" - }, - "node_modules/winston-gelf-transporter/node_modules/logform": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz", - "integrity": "sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==", - "license": "MIT", - "dependencies": { - "colors": "^1.2.1", - "fast-safe-stringify": "^2.0.4", - "fecha": "^2.3.3", - "ms": "^2.1.1", - "triple-beam": "^1.3.0" - } - }, - "node_modules/winston-gelf-transporter/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "license": "MIT", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/winston-gelf-transporter/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "license": "MIT" - }, - "node_modules/winston-gelf-transporter/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/winston-gelf-transporter/node_modules/winston-transport": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz", - "integrity": "sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==", - "license": "MIT", - "dependencies": { - "readable-stream": "^2.3.6", - "triple-beam": "^1.2.0" - }, - "engines": { - "node": ">= 6.4.0" - } - }, "node_modules/winston-loki": { "version": "6.1.5", "resolved": "https://registry.npmjs.org/winston-loki/-/winston-loki-6.1.5.tgz", diff --git a/updater/sis-updater-worker/package.json b/updater/sis-updater-worker/package.json index c6d2404ab..aa7929423 100644 --- a/updater/sis-updater-worker/package.json +++ b/updater/sis-updater-worker/package.json @@ -17,19 +17,15 @@ "sequelize": "^6.37.8", "umzug": "^3.8.3", "winston": "^3.19.0", - "winston-gelf-transporter": "^1.0.2", "winston-loki": "^6.1.5", "winston-transport-sentry-node": "^3.0.0" }, "devDependencies": { - "@types/pg": "^8.18.0" + "nodemon": "3.1.14" }, "overrides": { "winston-gelf-transporter": { "gelf-pro": "~1.4" } - }, - "devDependencies": { - "nodemon": "3.1.14" } } diff --git a/updater/sis-updater-worker/src/utils/logger.js b/updater/sis-updater-worker/src/utils/logger.js index 09e0056eb..db3d1e9cd 100644 --- a/updater/sis-updater-worker/src/utils/logger.js +++ b/updater/sis-updater-worker/src/utils/logger.js @@ -1,6 +1,4 @@ -import os from 'os' import { format as winstonFormat, transports as winstonTransports, createLogger } from 'winston' -import { WinstonGelfTransporter } from 'winston-gelf-transporter' import LokiTransport from 'winston-loki' import WinstonSentry from 'winston-transport-sentry-node' @@ -47,22 +45,6 @@ transports.push( }) ) -if (isProduction && !isStaging) { - transports.push( - new WinstonGelfTransporter({ - handleExceptions: true, - host: 'svm-116.cs.helsinki.fi', - port: 9503, - protocol: 'udp', - hostName: os.hostname(), - additional: { - app: 'updater-worker', - environment: 'production', - }, - }) - ) -} - const logger = createLogger({ transports }) logger.on('error', error => console.error('Logging failed. Reason: ', error)) // eslint-disable-line no-console