From c88242c4af239b85740d4321f657cb02cdc4f405 Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Mon, 20 Jun 2022 07:57:08 +0200 Subject: [PATCH] forbid `stop` global variable (#149) --- .eslintrc.cjs | 1 + packages/services/rate-limit/src/index.ts | 2 +- packages/services/usage-estimator/src/index.ts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 180b5670c..1eefd6343 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -21,6 +21,7 @@ module.exports = { plugins: ['@typescript-eslint', 'import', 'hive'], extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended'], rules: { + 'no-restricted-globals': ['error', 'stop'], '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_', ignoreRestSiblings: true }], 'no-empty': ['error', { allowEmptyCatch: true }], diff --git a/packages/services/rate-limit/src/index.ts b/packages/services/rate-limit/src/index.ts index 967bce4bc..8c243ca24 100644 --- a/packages/services/rate-limit/src/index.ts +++ b/packages/services/rate-limit/src/index.ts @@ -50,7 +50,7 @@ async function main() { registerShutdown({ logger: server.log, async onShutdown() { - await Promise.all([stop(), server.close()]); + await Promise.all([ctx.stop(), server.close()]); }, }); diff --git a/packages/services/usage-estimator/src/index.ts b/packages/services/usage-estimator/src/index.ts index 2d6606bef..ca0a38fe3 100644 --- a/packages/services/usage-estimator/src/index.ts +++ b/packages/services/usage-estimator/src/index.ts @@ -44,7 +44,7 @@ async function main() { registerShutdown({ logger: server.log, async onShutdown() { - await Promise.all([stop(), server.close()]); + await Promise.all([context.stop(), server.close()]); }, });