mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-13 21:46:15 +01:00
704da08fdc
* 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
86 lines
2.4 KiB
Go
86 lines
2.4 KiB
Go
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package log
|
|
|
|
import (
|
|
"fmt"
|
|
"net/smtp"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestSMTPLogger(t *testing.T) {
|
|
prefix := "TestPrefix "
|
|
level := INFO
|
|
flags := LstdFlags | LUTC | Lfuncname
|
|
username := "testuser"
|
|
password := "testpassword"
|
|
host := "testhost"
|
|
subject := "testsubject"
|
|
sendTos := []string{"testto1", "testto2"}
|
|
|
|
logger := NewSMTPLogger()
|
|
smtpLogger, ok := logger.(*SMTPLogger)
|
|
assert.Equal(t, true, ok)
|
|
|
|
err := logger.Init(fmt.Sprintf("{\"prefix\":\"%s\",\"level\":\"%s\",\"flags\":%d,\"username\":\"%s\",\"password\":\"%s\",\"host\":\"%s\",\"subject\":\"%s\",\"sendTos\":[\"%s\",\"%s\"]}", prefix, level.String(), flags, username, password, host, subject, sendTos[0], sendTos[1]))
|
|
assert.NoError(t, err)
|
|
|
|
assert.Equal(t, flags, smtpLogger.Flags)
|
|
assert.Equal(t, level, smtpLogger.Level)
|
|
assert.Equal(t, level, logger.GetLevel())
|
|
|
|
location, _ := time.LoadLocation("EST")
|
|
|
|
date := time.Date(2019, time.January, 13, 22, 3, 30, 15, location)
|
|
|
|
dateString := date.UTC().Format("2006/01/02 15:04:05")
|
|
|
|
event := Event{
|
|
level: INFO,
|
|
msg: "TEST MSG",
|
|
caller: "CALLER",
|
|
filename: "FULL/FILENAME",
|
|
line: 1,
|
|
time: date,
|
|
}
|
|
|
|
expected := fmt.Sprintf("%s%s %s:%d:%s [%c] %s\n", prefix, dateString, event.filename, event.line, event.caller, strings.ToUpper(event.level.String())[0], event.msg)
|
|
|
|
var envToHost string
|
|
var envFrom string
|
|
var envTo []string
|
|
var envMsg []byte
|
|
smtpLogger.sendMailFn = func(addr string, a smtp.Auth, from string, to []string, msg []byte) error {
|
|
envToHost = addr
|
|
envFrom = from
|
|
envTo = to
|
|
envMsg = msg
|
|
return nil
|
|
}
|
|
|
|
err = logger.LogEvent(&event)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, host, envToHost)
|
|
assert.Equal(t, username, envFrom)
|
|
assert.Equal(t, sendTos, envTo)
|
|
assert.Contains(t, string(envMsg), expected)
|
|
|
|
logger.Flush()
|
|
|
|
event.level = WARN
|
|
expected = fmt.Sprintf("%s%s %s:%d:%s [%c] %s\n", prefix, dateString, event.filename, event.line, event.caller, strings.ToUpper(event.level.String())[0], event.msg)
|
|
err = logger.LogEvent(&event)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, host, envToHost)
|
|
assert.Equal(t, username, envFrom)
|
|
assert.Equal(t, sendTos, envTo)
|
|
assert.Contains(t, string(envMsg), expected)
|
|
|
|
logger.Close()
|
|
}
|