mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-01 07:09:21 +01:00
18f26cfbf7
Before there was a "graceful function": RunWithShutdownFns, it's mainly for some modules which doesn't support context. The old queue system doesn't work well with context, so the old queues need it. After the queue refactoring, the new queue works with context well, so, use Golang context as much as possible, the `RunWithShutdownFns` could be removed (replaced by RunWithCancel for context cancel mechanism), the related code could be simplified. This PR also fixes some legacy queue-init problems, eg: * typo : archiver: "unable to create codes indexer queue" => "unable to create repo-archive queue" * no nil check for failed queues, which causes unfriendly panic After this PR, many goroutines could have better display name:  
75 lines
1.7 KiB
Go
75 lines
1.7 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package log
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"net"
|
|
"strings"
|
|
"sync"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func listenReadAndClose(t *testing.T, l net.Listener, expected string) {
|
|
conn, err := l.Accept()
|
|
assert.NoError(t, err)
|
|
defer conn.Close()
|
|
written, err := io.ReadAll(conn)
|
|
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, expected, string(written))
|
|
}
|
|
|
|
func TestConnLogger(t *testing.T) {
|
|
protocol := "tcp"
|
|
address := ":3099"
|
|
|
|
l, err := net.Listen(protocol, address)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer l.Close()
|
|
|
|
prefix := "TestPrefix "
|
|
level := INFO
|
|
flags := LstdFlags | LUTC | Lfuncname
|
|
|
|
logger := NewLoggerWithWriters(context.Background(), "test", NewEventWriterConn("test-conn", WriterMode{
|
|
Level: level,
|
|
Prefix: prefix,
|
|
Flags: FlagsFromBits(flags),
|
|
WriterOption: WriterConnOption{Addr: address, Protocol: protocol, Reconnect: true, ReconnectOnMsg: true},
|
|
}))
|
|
|
|
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,
|
|
MsgSimpleText: "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.MsgSimpleText)
|
|
var wg sync.WaitGroup
|
|
wg.Add(1)
|
|
go func() {
|
|
defer wg.Done()
|
|
listenReadAndClose(t, l, expected)
|
|
}()
|
|
logger.SendLogEvent(&event)
|
|
wg.Wait()
|
|
|
|
logger.Close()
|
|
}
|