You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

111 lines
2.0 KiB

Better logging (#6038) (#6095) * Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton <art27@cantab.net> * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton <art27@cantab.net> * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton <art27@cantab.net> * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove nal * set log-levels to lowercase * Make console_test test all levels * switch to lowercased levels * OK now working * Fix vetting issues * Fix lint * Fix tests * change default logging to match current gitea * Improve log testing Signed-off-by: Andrew Thornton <art27@cantab.net> * reset error skip levels to 0 * Update documentation and access logger configuration * Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE * Fix broken level caching * Refactor the router log * Add Router logger * Add colorizing options * Adjust router colors * Only create logger if they will be used * update app.ini.sample * rename Attribute ColorAttribute * Change from white to green for function * Set fatal/error levels * Restore initial trace logger * Fix Trace arguments in modules/auth/auth.go * Properly handle XORMLogger * Improve admin/config page * fix fmt * Add auto-compression of old logs * Update error log levels * Remove the unnecessary skip argument from Error, Fatal and Critical * Add stacktrace support * Fix tests * Remove x/sync from vendors? * Add stderr option to console logger * Use filepath.ToSlash to protect against Windows in tests * Remove prefixed underscores from names in colors.go * Remove not implemented database logger This was removed from Gogs on 4 Mar 2016 but left in the configuration since then. * Ensure that log paths are relative to ROOT_PATH * use path.Join * rename jsonConfig to logConfig * Rename "config" to "jsonConfig" to make it clearer * Requested changes * Requested changes: XormLogger * Try to color the windows terminal If successful default to colorizing the console logs * fixup * Colorize initially too * update vendor * Colorize logs on default and remove if this is not a colorizing logger * Fix documentation * fix test * Use go-isatty to detect if on windows we are on msys or cygwin * Fix spelling mistake * Add missing vendors * More changes * Rationalise the ANSI writer protection * Adjust colors on advice from @0x5c * Make Flags a comma separated list * Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING * Ensure matching is done on the non-colored message - to simpify EXPRESSION
5 years ago
Better logging (#6038) (#6095) * Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton <art27@cantab.net> * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton <art27@cantab.net> * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton <art27@cantab.net> * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove nal * set log-levels to lowercase * Make console_test test all levels * switch to lowercased levels * OK now working * Fix vetting issues * Fix lint * Fix tests * change default logging to match current gitea * Improve log testing Signed-off-by: Andrew Thornton <art27@cantab.net> * reset error skip levels to 0 * Update documentation and access logger configuration * Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE * Fix broken level caching * Refactor the router log * Add Router logger * Add colorizing options * Adjust router colors * Only create logger if they will be used * update app.ini.sample * rename Attribute ColorAttribute * Change from white to green for function * Set fatal/error levels * Restore initial trace logger * Fix Trace arguments in modules/auth/auth.go * Properly handle XORMLogger * Improve admin/config page * fix fmt * Add auto-compression of old logs * Update error log levels * Remove the unnecessary skip argument from Error, Fatal and Critical * Add stacktrace support * Fix tests * Remove x/sync from vendors? * Add stderr option to console logger * Use filepath.ToSlash to protect against Windows in tests * Remove prefixed underscores from names in colors.go * Remove not implemented database logger This was removed from Gogs on 4 Mar 2016 but left in the configuration since then. * Ensure that log paths are relative to ROOT_PATH * use path.Join * rename jsonConfig to logConfig * Rename "config" to "jsonConfig" to make it clearer * Requested changes * Requested changes: XormLogger * Try to color the windows terminal If successful default to colorizing the console logs * fixup * Colorize initially too * update vendor * Colorize logs on default and remove if this is not a colorizing logger * Fix documentation * fix test * Use go-isatty to detect if on windows we are on msys or cygwin * Fix spelling mistake * Add missing vendors * More changes * Rationalise the ANSI writer protection * Adjust colors on advice from @0x5c * Make Flags a comma separated list * Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING * Ensure matching is done on the non-colored message - to simpify EXPRESSION
5 years ago
  1. // Copyright 2019 The Gitea Authors. All rights reserved.
  2. // Use of this source code is governed by a MIT-style
  3. // license that can be found in the LICENSE file.
  4. package log
  5. import (
  6. "bytes"
  7. "encoding/json"
  8. "fmt"
  9. "os"
  10. "strings"
  11. )
  12. // Level is the level of the logger
  13. type Level int
  14. const (
  15. // TRACE represents the lowest log level
  16. TRACE Level = iota
  17. // DEBUG is for debug logging
  18. DEBUG
  19. // INFO is for information
  20. INFO
  21. // WARN is for warning information
  22. WARN
  23. // ERROR is for error reporting
  24. ERROR
  25. // CRITICAL is for critical errors
  26. CRITICAL
  27. // FATAL is for fatal errors
  28. FATAL
  29. // NONE is for no logging
  30. NONE
  31. )
  32. var toString = map[Level]string{
  33. TRACE: "trace",
  34. DEBUG: "debug",
  35. INFO: "info",
  36. WARN: "warn",
  37. ERROR: "error",
  38. CRITICAL: "critical",
  39. FATAL: "fatal",
  40. NONE: "none",
  41. }
  42. var toLevel = map[string]Level{
  43. "trace": TRACE,
  44. "debug": DEBUG,
  45. "info": INFO,
  46. "warn": WARN,
  47. "error": ERROR,
  48. "critical": CRITICAL,
  49. "fatal": FATAL,
  50. "none": NONE,
  51. }
  52. // Levels returns all the possible logging levels
  53. func Levels() []string {
  54. keys := make([]string, 0)
  55. for key := range toLevel {
  56. keys = append(keys, key)
  57. }
  58. return keys
  59. }
  60. func (l Level) String() string {
  61. s, ok := toString[l]
  62. if ok {
  63. return s
  64. }
  65. return "info"
  66. }
  67. // MarshalJSON takes a Level and turns it into text
  68. func (l Level) MarshalJSON() ([]byte, error) {
  69. buffer := bytes.NewBufferString(`"`)
  70. buffer.WriteString(toString[l])
  71. buffer.WriteString(`"`)
  72. return buffer.Bytes(), nil
  73. }
  74. // FromString takes a level string and returns a Level
  75. func FromString(level string) Level {
  76. temp, ok := toLevel[strings.ToLower(level)]
  77. if !ok {
  78. return INFO
  79. }
  80. return temp
  81. }
  82. // UnmarshalJSON takes text and turns it into a Level
  83. func (l *Level) UnmarshalJSON(b []byte) error {
  84. var tmp interface{}
  85. err := json.Unmarshal(b, &tmp)
  86. if err != nil {
  87. fmt.Fprintf(os.Stderr, "Err: %v", err)
  88. return err
  89. }
  90. switch v := tmp.(type) {
  91. case string:
  92. *l = FromString(v)
  93. case int:
  94. *l = FromString(Level(v).String())
  95. default:
  96. *l = INFO
  97. }
  98. return nil
  99. }