Skip to content
This repository was archived by the owner on Jun 8, 2021. It is now read-only.

Add date and ignored urls #2

Open
SergeiLomako wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Add date and ignored urls #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d1fca1
add date and ignored urls
SergeiLomako Jan 28, 2019
b71bd6d
fix tests
SergeiLomako Feb 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions providers/LoggerProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const { ServiceProvider } = require('@adonisjs/fold')
class LoggerProvider extends ServiceProvider {
boot () {
const env = use('Adonis/Src/Config').get('app.http.loggerEnv')
const ignoredUrls = use('Adonis/Src/Config').get('app.http.ignoredUrls')

/**
* Hook only when enabled for current NODE_ENV
Expand All @@ -24,8 +25,10 @@ class LoggerProvider extends ServiceProvider {
const Logger = require('../src/Logger')

HttpContext.onReady(function (ctx) {
const logger = new Logger(ctx, AdonisLogger)
logger.hook()
if (!ignoredUrls.includes(ctx.request.url())) {
const logger = new Logger(ctx, AdonisLogger)
logger.hook()
}
})
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/Logger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,13 @@ class Logger {
log (url, method, statusCode, startedAt, code) {
const ms = prettyMs(this._diffHrTime(startedAt))
const logLevel = this._getLogLevel(statusCode)
const now = new Date().toISOString()

/**
* Log normally when json is not set to true
*/
if (!this.isJson) {
this.Logger[logLevel]('%s %s %s %s', method, statusCode, url, ms)
this.Logger[logLevel]('%s | %s %s %s %s', now, method, statusCode, url, ms)
return
}

Expand All @@ -114,7 +115,7 @@ class Logger {
*/
hook () {
const start = process.hrtime()
const url = this.request.url()
const url = this.request.originalUrl()
const method = this.request.method()

onFinished(this.res, (error, res) => {
Expand Down
20 changes: 10 additions & 10 deletions test/logger.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ test.group('Logger', (group) => {
const server = http.createServer((req, res) => {
const request = {
method: () => req.method,
url: () => req.url
originalUrl: () => req.url
}

const response = {
Expand All @@ -71,7 +71,7 @@ test.group('Logger', (group) => {
const server = http.createServer((req, res) => {
const request = {
method: () => req.method,
url: () => req.url
originalUrl: () => req.url
}

const response = {
Expand Down Expand Up @@ -99,7 +99,7 @@ test.group('Logger', (group) => {
const server = http.createServer((req, res) => {
const request = {
method: () => req.method,
url: () => req.url
originalUrl: () => req.url
}

const response = {
Expand Down Expand Up @@ -135,7 +135,7 @@ test.group('Logger', (group) => {
const server = http.createServer((req, res) => {
const request = {
method: () => req.method,
url: () => req.url
originalUrl: () => req.url
}

const response = {
Expand Down Expand Up @@ -170,7 +170,7 @@ test.group('Logger', (group) => {
const server = http.createServer((req, res) => {
const request = {
method: () => req.method,
url: () => req.url
originalUrl: () => req.url
}

const response = {
Expand All @@ -185,10 +185,10 @@ test.group('Logger', (group) => {
}, 200)
})

await supertest(server).get('/')
assert.equal(adLogger.messages.info[0], '%s %s %s %s')
assert.equal(adLogger.messages.info[1], 'GET')
assert.equal(adLogger.messages.info[2], 200)
assert.equal(adLogger.messages.info[3], '/')
await supertest(server).get('/test?query=OK')
assert.equal(adLogger.messages.info[0], '%s | %s %s %s %s')
assert.equal(adLogger.messages.info[2], 'GET')
assert.equal(adLogger.messages.info[3], 200)
assert.equal(adLogger.messages.info[4], '/test?query=OK')
})
})