diff options
author | zeripath <art27@cantab.net> | 2019-04-02 08:48:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-02 08:48:31 +0100 |
commit | 704da08fdc6bae6fdd6bf1b892ebe12afeef5eca (patch) | |
tree | e0613ab3ba0d4336b0912bbad8862f503ec180f6 /modules/markup | |
parent | ef2a343e27d8af2de0bb696bd60d9a019e1e8b69 (diff) | |
download | gitea-704da08fdc6bae6fdd6bf1b892ebe12afeef5eca.tar.gz gitea-704da08fdc6bae6fdd6bf1b892ebe12afeef5eca.zip |
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
Diffstat (limited to 'modules/markup')
-rw-r--r-- | modules/markup/external/external.go | 8 | ||||
-rw-r--r-- | modules/markup/markup.go | 2 | ||||
-rw-r--r-- | modules/markup/orgmode/orgmode.go | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/modules/markup/external/external.go b/modules/markup/external/external.go index 5963a06d30..02cf61be16 100644 --- a/modules/markup/external/external.go +++ b/modules/markup/external/external.go @@ -67,7 +67,7 @@ func (p *Parser) Render(rawBytes []byte, urlPrefix string, metas map[string]stri // write to temp file f, err := ioutil.TempFile("", "gitea_input") if err != nil { - log.Error(4, "%s create temp file when rendering %s failed: %v", p.Name(), p.Command, err) + log.Error("%s create temp file when rendering %s failed: %v", p.Name(), p.Command, err) return []byte("") } defer os.Remove(f.Name()) @@ -75,13 +75,13 @@ func (p *Parser) Render(rawBytes []byte, urlPrefix string, metas map[string]stri _, err = io.Copy(f, rd) if err != nil { f.Close() - log.Error(4, "%s write data to temp file when rendering %s failed: %v", p.Name(), p.Command, err) + log.Error("%s write data to temp file when rendering %s failed: %v", p.Name(), p.Command, err) return []byte("") } err = f.Close() if err != nil { - log.Error(4, "%s close temp file when rendering %s failed: %v", p.Name(), p.Command, err) + log.Error("%s close temp file when rendering %s failed: %v", p.Name(), p.Command, err) return []byte("") } args = append(args, f.Name()) @@ -98,7 +98,7 @@ func (p *Parser) Render(rawBytes []byte, urlPrefix string, metas map[string]stri } cmd.Stdout = buf if err := cmd.Run(); err != nil { - log.Error(4, "%s render run command %s %v failed: %v", p.Name(), commands[0], args, err) + log.Error("%s render run command %s %v failed: %v", p.Name(), commands[0], args, err) return []byte("") } return buf.Bytes() diff --git a/modules/markup/markup.go b/modules/markup/markup.go index c506007723..0ea4099600 100644 --- a/modules/markup/markup.go +++ b/modules/markup/markup.go @@ -74,7 +74,7 @@ func render(parser Parser, rawBytes []byte, urlPrefix string, metas map[string]s // TODO: one day the error should be returned. result, err := PostProcess(result, urlPrefix, metas, isWiki) if err != nil { - log.Error(3, "PostProcess: %v", err) + log.Error("PostProcess: %v", err) } return SanitizeBytes(result) } diff --git a/modules/markup/orgmode/orgmode.go b/modules/markup/orgmode/orgmode.go index 6b6d622d7b..f63155201e 100644 --- a/modules/markup/orgmode/orgmode.go +++ b/modules/markup/orgmode/orgmode.go @@ -35,7 +35,7 @@ func (Parser) Extensions() []string { func Render(rawBytes []byte, urlPrefix string, metas map[string]string, isWiki bool) (result []byte) { defer func() { if err := recover(); err != nil { - log.Error(4, "Panic in orgmode.Render: %v Just returning the rawBytes", err) + log.Error("Panic in orgmode.Render: %v Just returning the rawBytes", err) result = rawBytes } }() |