From 927df7301b35c16f390400a31a793327d97dcdb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Lenon?= Date: Wed, 26 Oct 2022 17:03:51 -0300 Subject: [PATCH] chore(npm): update dependencies --- package-lock.json | 18 ++++----- package.json | 4 +- tests/Stubs/config/app.js | 18 +++++++-- tests/Stubs/config/logging.js | 69 +++++++++++++++++++++++++++++++---- 4 files changed, 86 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index 120fdc4..fe6e027 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "@athenna/test", - "version": "1.3.4", + "version": "1.3.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@athenna/test", - "version": "1.3.4", + "version": "1.3.5", "license": "MIT", "dependencies": { - "@athenna/core": "2.0.1", + "@athenna/core": "2.0.2", "@japa/assert": "1.3.4", "@japa/runner": "2.0.7" }, @@ -122,9 +122,9 @@ } }, "node_modules/@athenna/core": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@athenna/core/-/core-2.0.1.tgz", - "integrity": "sha512-L5b1C50nF5moXYEaRdwI54/kydsS8Sl/5TG0MB63XCU59RdqZttiOBNCs2wSKjAbyDz2St1BPk5BtZAPRIz5zQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@athenna/core/-/core-2.0.2.tgz", + "integrity": "sha512-PmFOs0xzd6m8SXMsauIRHQ61cXQ9DWceXLhQDA4jVefsQRcTUCsX0Z9FF33JL0Qo/XZbc7gFmGQcobUvKaJKew==", "dependencies": { "@athenna/artisan": "1.5.7", "@athenna/common": "1.0.0", @@ -8827,9 +8827,9 @@ } }, "@athenna/core": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@athenna/core/-/core-2.0.1.tgz", - "integrity": "sha512-L5b1C50nF5moXYEaRdwI54/kydsS8Sl/5TG0MB63XCU59RdqZttiOBNCs2wSKjAbyDz2St1BPk5BtZAPRIz5zQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@athenna/core/-/core-2.0.2.tgz", + "integrity": "sha512-PmFOs0xzd6m8SXMsauIRHQ61cXQ9DWceXLhQDA4jVefsQRcTUCsX0Z9FF33JL0Qo/XZbc7gFmGQcobUvKaJKew==", "requires": { "@athenna/artisan": "1.5.7", "@athenna/common": "1.0.0", diff --git a/package.json b/package.json index 7954468..c84aeab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@athenna/test", - "version": "1.3.4", + "version": "1.3.5", "description": "The Athenna test runner. Built on top of Japa.", "license": "MIT", "author": "João Lenon ", @@ -42,7 +42,7 @@ "#tests/*": "./tests/*.js" }, "dependencies": { - "@athenna/core": "2.0.1", + "@athenna/core": "2.0.2", "@japa/assert": "1.3.4", "@japa/runner": "2.0.7" }, diff --git a/tests/Stubs/config/app.js b/tests/Stubs/config/app.js index f141384..859033b 100644 --- a/tests/Stubs/config/app.js +++ b/tests/Stubs/config/app.js @@ -1,5 +1,5 @@ import { Log } from '@athenna/logger' -import { Server } from '@athenna/http' +import { ProviderHelper } from '@athenna/core' export default { /* @@ -123,10 +123,19 @@ export default { | */ - gracefulShutdown: async () => { - Log.warn('Athenna application gracefully shutting down.') + gracefulShutdown: { + SIGINT: async () => { + await ProviderHelper.shutdownAll() - await Server.close() + process.exit() + }, + SIGTERM: async signal => { + Log.warn('Athenna application gracefully shutting down.') + + await ProviderHelper.shutdownAll() + + process.kill(process.pid, signal) + }, }, /* @@ -143,6 +152,7 @@ export default { providers: [ import('@athenna/artisan/providers/ArtisanProvider'), import('@athenna/artisan/providers/TemplateProvider'), + import('@athenna/artisan/providers/TemplateProvider'), import('@athenna/http/providers/HttpServerProvider'), import('@athenna/http/providers/HttpRouteProvider'), import('@athenna/logger/providers/LoggerProvider'), diff --git a/tests/Stubs/config/logging.js b/tests/Stubs/config/logging.js index 5bff62e..389cda5 100644 --- a/tests/Stubs/config/logging.js +++ b/tests/Stubs/config/logging.js @@ -1,3 +1,5 @@ +import { Path } from '@athenna/common' + export default { /* |-------------------------------------------------------------------------- @@ -10,7 +12,7 @@ export default { | */ - default: 'application', + default: 'stack', /* |-------------------------------------------------------------------------- @@ -19,33 +21,84 @@ export default { | | Here you may configure the log channels for your application. | + | Available Drivers: + | "stack", "console", "discord", "file", "null", "slack", "telegram". + | Available Formatters: + | "cli", "simple", "json", "request", "message". + | */ channels: { + stack: { + driver: 'stack', + channels: ['application'], + }, + application: { driver: 'console', + level: 'trace', + formatter: 'simple', - streamType: 'stdout', - formatterConfig: {}, }, console: { - driver: 'null', + driver: 'console', + level: 'trace', + formatter: 'cli', - streamType: 'stdout', - formatterConfig: {}, }, exception: { driver: 'console', + level: 'trace', + streamType: 'stderr', + formatter: 'none', - streamType: 'stdout', }, request: { driver: 'console', + level: 'trace', + formatter: 'request', - streamType: 'stdout', formatterConfig: { asJson: false, }, }, + discard: { + driver: 'null', + }, + file: { + driver: 'file', + level: 'trace', + filePath: Path.logs('athenna.log'), + + formatter: 'simple', + formatterConfig: {}, + }, + slack: { + driver: 'slack', + level: 'fatal', + url: 'your-slack-webhook-url', + + formatter: 'message', + formatterConfig: {}, + }, + discord: { + driver: 'discord', + level: 'fatal', + username: 'Athenna', + url: 'your-discord-webhook-url', + + formatter: 'message', + formatterConfig: {}, + }, + telegram: { + driver: 'telegram', + level: 'fatal', + chatId: 0, + parseMode: 'HTML', + token: 'your-telegram-bot-token', + + formatter: 'message', + formatterConfig: {}, + }, }, }