From 704da08fdc6bae6fdd6bf1b892ebe12afeef5eca Mon Sep 17 00:00:00 2001 From: zeripath Date: Tue, 2 Apr 2019 08:48:31 +0100 Subject: Better logging (#6038) (#6095) * Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton * 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 * 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 --- routers/org/members.go | 2 +- routers/org/teams.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'routers/org') diff --git a/routers/org/members.go b/routers/org/members.go index 8a243c87be..d65bc2a008 100644 --- a/routers/org/members.go +++ b/routers/org/members.go @@ -78,7 +78,7 @@ func MembersAction(ctx *context.Context) { } if err != nil { - log.Error(4, "Action(%s): %v", ctx.Params(":action"), err) + log.Error("Action(%s): %v", ctx.Params(":action"), err) ctx.JSON(200, map[string]interface{}{ "ok": false, "err": err.Error(), diff --git a/routers/org/teams.go b/routers/org/teams.go index 1c09737997..27db14e4b5 100644 --- a/routers/org/teams.go +++ b/routers/org/teams.go @@ -109,7 +109,7 @@ func TeamsAction(ctx *context.Context) { if models.IsErrLastOrgOwner(err) { ctx.Flash.Error(ctx.Tr("form.last_org_owner")) } else { - log.Error(3, "Action(%s): %v", ctx.Params(":action"), err) + log.Error("Action(%s): %v", ctx.Params(":action"), err) ctx.JSON(200, map[string]interface{}{ "ok": false, "err": err.Error(), @@ -156,7 +156,7 @@ func TeamsRepoAction(ctx *context.Context) { } if err != nil { - log.Error(3, "Action(%s): '%s' %v", ctx.Params(":action"), ctx.Org.Team.Name, err) + log.Error("Action(%s): '%s' %v", ctx.Params(":action"), ctx.Org.Team.Name, err) ctx.ServerError("TeamsRepoAction", err) return } -- cgit v1.2.3