middleware/logger: new configuration field, defaults to false: Query bool, if true prints the full path, including the URL query as requested at https://github.com/kataras/iris/issues/1017

Former-commit-id: 03c8fc523a8ba955dae43e4c7e9498fc3d86a1c8
This commit is contained in:
Gerasimos Maropoulos 2018-05-31 01:39:23 +03:00
parent 5de17a08f9
commit f84248cb4e
4 changed files with 15 additions and 2 deletions

View File

@ -17,6 +17,8 @@ func main() {
Method: true, Method: true,
// Path displays the request path // Path displays the request path
Path: true, Path: true,
// Query appends the url query to the Path.
Query: true,
//Columns: true, //Columns: true,

View File

@ -85,7 +85,7 @@ func newRequestLogger() (h iris.Handler, close func() error) {
return err 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) output := logger.Columnize(now.Format("2006/01/02 - 15:04:05"), latency, status, ip, method, path, message, headerMessage)
logFile.Write([]byte(output)) logFile.Write([]byte(output))
} }

View File

@ -30,6 +30,12 @@ type Config struct {
// Defaults to true. // Defaults to true.
Path bool 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). // 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 // 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. // use the `Columinize` function of the logger to get the output result as columns.
@ -81,6 +87,7 @@ func DefaultConfig() Config {
IP: true, IP: true,
Method: true, Method: true,
Path: true, Path: true,
Query: false,
Columns: false, Columns: false,
LogFunc: nil, LogFunc: nil,
Skippers: nil, Skippers: nil,

View File

@ -66,7 +66,11 @@ func (l *requestLoggerMiddleware) ServeHTTP(ctx context.Context) {
} }
if l.config.Path { if l.config.Path {
path = ctx.Path() if l.config.Query {
path = ctx.Request().URL.RequestURI()
} else {
path = ctx.Path()
}
} }
var message interface{} var message interface{}