From 8d9fdfeafc09af14447890b91fff2783541d74f7 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 22 May 2019 21:43:56 +0800 Subject: [PATCH] change parameter to unnecssary for glog.Header/Stdout; version updates --- g/os/glog/glog_chaining.go | 10 ++++++---- g/os/glog/glog_logger_chaining.go | 22 ++++++++++++++++------ version.go | 2 +- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/g/os/glog/glog_chaining.go b/g/os/glog/glog_chaining.go index 231af31fa..7b989f507 100644 --- a/g/os/glog/glog_chaining.go +++ b/g/os/glog/glog_chaining.go @@ -48,14 +48,16 @@ func Backtrace(enabled bool, skip...int) *Logger { // StdPrint is a chaining function, // which enables/disables stdout for the current logging content output. -func Stdout(enabled bool) *Logger { - return logger.Stdout(enabled) +// It's enabled in default. +func Stdout(enabled...bool) *Logger { + return logger.Stdout(enabled...) } // Header is a chaining function, // which enables/disables log header for the current logging content output. -func Header(enabled bool) *Logger { - return logger.Header(enabled) +// It's enabled in default. +func Header(enabled...bool) *Logger { + return logger.Header(enabled...) } // Line is a chaining function, diff --git a/g/os/glog/glog_logger_chaining.go b/g/os/glog/glog_logger_chaining.go index 63e13a46b..6a9111031 100644 --- a/g/os/glog/glog_logger_chaining.go +++ b/g/os/glog/glog_logger_chaining.go @@ -99,33 +99,43 @@ func (l *Logger) Backtrace(enabled bool, skip...int) *Logger { // Stdout is a chaining function, // which enables/disables stdout for the current logging content output. -func (l *Logger) Stdout(enabled bool) *Logger { +// It's enabled in default. +func (l *Logger) Stdout(enabled...bool) *Logger { logger := (*Logger)(nil) if l.parent == nil { logger = l.Clone() } else { logger = l } - logger.stdoutPrint = enabled + if len(enabled) > 0 && enabled[0] { + logger.stdoutPrint = true + } else { + logger.stdoutPrint = false + } return logger } // See Stdout. // Deprecated. -func (l *Logger) StdPrint(enabled bool) *Logger { - return l.Stdout(enabled) +func (l *Logger) StdPrint(enabled...bool) *Logger { + return l.Stdout(enabled...) } // Header is a chaining function, // which enables/disables log header for the current logging content output. -func (l *Logger) Header(enabled bool) *Logger { +// It's enabled in default. +func (l *Logger) Header(enabled...bool) *Logger { logger := (*Logger)(nil) if l.parent == nil { logger = l.Clone() } else { logger = l } - logger.SetHeaderPrint(enabled) + if len(enabled) > 0 && enabled[0] { + logger.SetHeaderPrint(true) + } else { + logger.SetHeaderPrint(false) + } return logger } diff --git a/version.go b/version.go index 3a5151943..6589dd5ed 100644 --- a/version.go +++ b/version.go @@ -1,4 +1,4 @@ package gf -const VERSION = "v1.6.13" +const VERSION = "v1.6.14" const AUTHORS = "john"