Skip to content

Commit

Permalink
middleware/logger: new configuration field, defaults to false: `Query…
Browse files Browse the repository at this point in the history
… bool`, if true prints the full path, including the URL query as requested at kataras#1017

Former-commit-id: 03c8fc523a8ba955dae43e4c7e9498fc3d86a1c8
  • Loading branch information
kataras committed May 30, 2018
1 parent 5de17a0 commit f84248c
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 2 deletions.
2 changes: 2 additions & 0 deletions _examples/http_request/request-logger/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ func main() {
Method: true,
// Path displays the request path
Path: true,
// Query appends the url query to the Path.
Query: true,

//Columns: true,

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func newRequestLogger() (h iris.Handler, close func() error) {
return err
}

c.LogFunc = func(now time.Time, latency time.Duration, status, ip, method, path string, message interface{},headerMessage interface{}) {
c.LogFunc = func(now time.Time, latency time.Duration, status, ip, method, path string, message interface{}, headerMessage interface{}) {
output := logger.Columnize(now.Format("2006/01/02 - 15:04:05"), latency, status, ip, method, path, message, headerMessage)
logFile.Write([]byte(output))
}
Expand Down
7 changes: 7 additions & 0 deletions middleware/logger/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ type Config struct {
// Defaults to true.
Path bool

// Query will append the URL Query to the Path.
// Path should be true too.
//
// Defaults to false.
Query bool

// Columns will display the logs as a formatted columns-rows text (bool).
// If custom `LogFunc` has been provided then this field is useless and users should
// use the `Columinize` function of the logger to get the output result as columns.
Expand Down Expand Up @@ -81,6 +87,7 @@ func DefaultConfig() Config {
IP: true,
Method: true,
Path: true,
Query: false,
Columns: false,
LogFunc: nil,
Skippers: nil,
Expand Down
6 changes: 5 additions & 1 deletion middleware/logger/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,11 @@ func (l *requestLoggerMiddleware) ServeHTTP(ctx context.Context) {
}

if l.config.Path {
path = ctx.Path()
if l.config.Query {
path = ctx.Request().URL.RequestURI()
} else {
path = ctx.Path()
}
}

var message interface{}
Expand Down

0 comments on commit f84248c

Please sign in to comment.