add log level prefix color #1312
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## develop #1312 +/- ##
===========================================
+ Coverage 69.62% 70.78% +1.15%
===========================================
Files 372 372
Lines 26621 32046 +5425
===========================================
+ Hits 18536 22683 +4147
- Misses 6531 7770 +1239
- Partials 1554 1593 +39
Continue to review full report at Codecov.
|
gqcn
requested changes
Jun 28, 2021
os/glog/glog_logger_level.go
Outdated
| @@ -29,6 +29,19 @@ const ( | |||
| LEVEL_FATA // 1024 | |||
| ) | |||
|
|
|||
| type logColor int | |||
os/glog/glog_logger.go
Outdated
| @@ -43,6 +43,7 @@ const ( | |||
| defaultFilePerm = os.FileMode(0666) | |||
| defaultFileExpire = time.Minute | |||
| pathFilterKey = "/os/glog/glog" | |||
| mustWithColor = true | |||
There was a problem hiding this comment.
不需要使用额外的常量定义，固定颜色控制规则：
- 终端输出固定会输出颜色，开发者不能控制。
- 文件输出日志依靠开发者提供的配置项控制。
There was a problem hiding this comment.
这里是为了同时兼容文件和控制台输出，所以此处需要有控制选项
os/glog/glog_logger_chaining.go
Outdated
| @@ -245,3 +245,14 @@ func (l *Logger) Async(enabled ...bool) *Logger { | |||
| } | |||
| return logger | |||
| } | |||
|
|
|||
| func (l *Logger) Color(color logColor) *Logger { | |||
os/glog/glog_logger_config.go
Outdated
| @@ -42,6 +42,8 @@ type Config struct { | |||
| RotateBackupExpire time.Duration `json:"rotateBackupExpire"` // Max expire for rotated files, which is 0 in default, means no expiration. | |||
| RotateBackupCompress int `json:"rotateBackupCompress"` // Compress level for rotated files using gzip algorithm. It's 0 in default, means no compression. | |||
| RotateCheckInterval time.Duration `json:"rotateCheckInterval"` // Asynchronizely checks the backups and expiration at intervals. It's 1 hour in default. | |||
| FileColor bool `json:"fileColor"` // Logging level prefix with color or not (false in default). | |||
There was a problem hiding this comment.
建议使用类似FileColorEnabled见名知意、知类型的属性名称。
os/glog/glog_logger_config.go
Outdated
| @@ -42,6 +42,8 @@ type Config struct { | |||
| RotateBackupExpire time.Duration `json:"rotateBackupExpire"` // Max expire for rotated files, which is 0 in default, means no expiration. | |||
| RotateBackupCompress int `json:"rotateBackupCompress"` // Compress level for rotated files using gzip algorithm. It's 0 in default, means no compression. | |||
| RotateCheckInterval time.Duration `json:"rotateCheckInterval"` // Asynchronizely checks the backups and expiration at intervals. It's 1 hour in default. | |||
| FileColor bool `json:"fileColor"` // Logging level prefix with color or not (false in default). | |||
| color logColor `json:"-"` | |||
There was a problem hiding this comment.
一个简单的color不太好理解，建议使用currentColor或者customColor名称方便维护。
os/glog/glog_logger_config.go
Outdated
| @@ -252,3 +254,7 @@ func (l *Logger) SetPrefix(prefix string) { | |||
| func (l *Logger) SetHandlers(handlers ...Handler) { | |||
| l.config.Handlers = append(handlers, defaultHandler) | |||
| } | |||
|
|
|||
| func (l *Logger) SetColor(color logColor) { | |||
os/glog/glog_logger_handler.go
Outdated
| @@ -42,11 +43,15 @@ func (i *HandlerInput) addStringToBuffer(buffer *bytes.Buffer, s string) { | |||
| buffer.WriteString(s) | |||
| } | |||
|
|
|||
| func (i *HandlerInput) Buffer() *bytes.Buffer { | |||
| func (i *HandlerInput) Buffer(withColor ...bool) *bytes.Buffer { | |||
There was a problem hiding this comment.
这里是为了同时兼容文件和控制台输出，所以此处需要有控制选项
gqcn
requested changes
Jun 28, 2021
os/glog/glog_logger_handler.go
Outdated
| if i.logger.config.color != 0 { | ||
| color = i.logger.config.color | ||
| } | ||
| return fmt.Sprintf("\x1b[0;%dm%s\x1b[0m", color, s) |
There was a problem hiding this comment.
这样硬编码似乎不支持windows平台，建议使用第三方颜色包：https://github.com/fatih/color
* develop-up: (38 commits) revert gerror usage for package gvalid unify error package to gerror add CtxStrict feature for package gdb rename constants of package gpage from skake to upper camel case add context for intlog improve Record/Result converting for package gdb add context for intlog/gsession;improve struct/structs converting for package gconv unify command or enviroment key names for packages improve details for package glog add file configuration support for logger in ghttp.Server version updates add more unit testing cases for package ghttp add automatic fields mapping and filtering for Model.Where statements improve Order feature for package gdb improve function Increment/Decrement for package gdb add auto fields filtering feature for function Scan of package gdb; mark funtcion Struct/Structs deprecated for gdb.Model improve record converting for package gdb improve transaction feature for package gdb improve caller path filtering for package gdebug improve caller path filtering for package gdebug ... # Conflicts: # os/glog/glog_logger.go # os/glog/glog_logger_config.go # os/glog/glog_logger_level.go
![hound[bot]](https://avatars.githubusercontent.com/in/3598?s=60&v=4){kind=small}
| COLOR_BLUE | ||
| COLOR_MAGENTA | ||
| COLOR_CYAN | ||
| COLOR_WHITE |
There was a problem hiding this comment.
don't use ALL_CAPS in Go names; use CamelCase
| COLOR_YELLOW | ||
| COLOR_BLUE | ||
| COLOR_MAGENTA | ||
| COLOR_CYAN |
There was a problem hiding this comment.
don't use ALL_CAPS in Go names; use CamelCase
| COLOR_GREEN | ||
| COLOR_YELLOW | ||
| COLOR_BLUE | ||
| COLOR_MAGENTA |
There was a problem hiding this comment.
don't use ALL_CAPS in Go names; use CamelCase
| COLOR_RED | ||
| COLOR_GREEN | ||
| COLOR_YELLOW | ||
| COLOR_BLUE |
There was a problem hiding this comment.
don't use ALL_CAPS in Go names; use CamelCase
| COLOR_BLACK = 30 + iota | ||
| COLOR_RED | ||
| COLOR_GREEN | ||
| COLOR_YELLOW |
There was a problem hiding this comment.
don't use ALL_CAPS in Go names; use CamelCase
| const ( | ||
| COLOR_BLACK = 30 + iota | ||
| COLOR_RED | ||
| COLOR_GREEN |
There was a problem hiding this comment.
don't use ALL_CAPS in Go names; use CamelCase
| @@ -28,6 +29,17 @@ const ( | |||
| LEVEL_FATA // 1024 | |||
| ) | |||
|
|
|||
| const ( | |||
| COLOR_BLACK = 30 + iota | |||
| COLOR_RED | |||
There was a problem hiding this comment.
don't use ALL_CAPS in Go names; use CamelCase
| @@ -28,6 +29,17 @@ const ( | |||
| LEVEL_FATA // 1024 | |||
| ) | |||
|
|
|||
| const ( | |||
| COLOR_BLACK = 30 + iota | |||
There was a problem hiding this comment.
don't use ALL_CAPS in Go names; use CamelCase
exported const COLOR_BLACK should have comment (or a comment on this block) or be unexported
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.