mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-05 05:08:26 +01:00
4647660776
## ⚠️ Breaking The `log.<mode>.<logger>` style config has been dropped. If you used it, please check the new config manual & app.example.ini to make your instance output logs as expected. Although many legacy options still work, it's encouraged to upgrade to the new options. The SMTP logger is deleted because SMTP is not suitable to collect logs. If you have manually configured Gitea log options, please confirm the logger system works as expected after upgrading. ## Description Close #12082 and maybe more log-related issues, resolve some related FIXMEs in old code (which seems unfixable before) Just like rewriting queue #24505 : make code maintainable, clear legacy bugs, and add the ability to support more writers (eg: JSON, structured log) There is a new document (with examples): `logging-config.en-us.md` This PR is safer than the queue rewriting, because it's just for logging, it won't break other logic. ## The old problems The logging system is quite old and difficult to maintain: * Unclear concepts: Logger, NamedLogger, MultiChannelledLogger, SubLogger, EventLogger, WriterLogger etc * Some code is diffuclt to konw whether it is right: `log.DelNamedLogger("console")` vs `log.DelNamedLogger(log.DEFAULT)` vs `log.DelLogger("console")` * The old system heavily depends on ini config system, it's difficult to create new logger for different purpose, and it's very fragile. * The "color" trick is difficult to use and read, many colors are unnecessary, and in the future structured log could help * It's difficult to add other log formats, eg: JSON format * The log outputer doesn't have full control of its goroutine, it's difficult to make outputer have advanced behaviors * The logs could be lost in some cases: eg: no Fatal error when using CLI. * Config options are passed by JSON, which is quite fragile. * INI package makes the KEY in `[log]` section visible in `[log.sub1]` and `[log.sub1.subA]`, this behavior is quite fragile and would cause more unclear problems, and there is no strong requirement to support `log.<mode>.<logger>` syntax. ## The new design See `logger.go` for documents. ## Screenshot <details> ![image](https://github.com/go-gitea/gitea/assets/2114189/4462d713-ba39-41f5-bb08-de912e67e1ff) ![image](https://github.com/go-gitea/gitea/assets/2114189/b188035e-f691-428b-8b2d-ff7b2199b2f9) ![image](https://github.com/go-gitea/gitea/assets/2114189/132e9745-1c3b-4e00-9e0d-15eaea495dee) </details> ## TODO * [x] add some new tests * [x] fix some tests * [x] test some sub-commands (manually ....) --------- Co-authored-by: Jason Song <i@wolfogre.com> Co-authored-by: delvh <dev.lh@web.de> Co-authored-by: Giteabot <teabot@gitea.io>
221 lines
6.3 KiB
Go
221 lines
6.3 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"code.gitea.io/gitea/modules/log"
|
|
"code.gitea.io/gitea/modules/util"
|
|
|
|
ini "gopkg.in/ini.v1"
|
|
)
|
|
|
|
type ConfigSection interface {
|
|
Name() string
|
|
MapTo(interface{}) error
|
|
HasKey(key string) bool
|
|
NewKey(name, value string) (*ini.Key, error)
|
|
Key(key string) *ini.Key
|
|
Keys() []*ini.Key
|
|
ChildSections() []*ini.Section
|
|
}
|
|
|
|
// ConfigProvider represents a config provider
|
|
type ConfigProvider interface {
|
|
Section(section string) ConfigSection
|
|
NewSection(name string) (ConfigSection, error)
|
|
GetSection(name string) (ConfigSection, error)
|
|
Save() error
|
|
}
|
|
|
|
// ConfigSectionKey only searches the keys in the given section, but it is O(n).
|
|
// ini package has a special behavior: with "[sec] a=1" and an empty "[sec.sub]",
|
|
// then in "[sec.sub]", Key()/HasKey() can always see "a=1" because it always tries parent sections.
|
|
// It returns nil if the key doesn't exist.
|
|
func ConfigSectionKey(sec ConfigSection, key string) *ini.Key {
|
|
if sec == nil {
|
|
return nil
|
|
}
|
|
for _, k := range sec.Keys() {
|
|
if k.Name() == key {
|
|
return k
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func ConfigSectionKeyString(sec ConfigSection, key string, def ...string) string {
|
|
k := ConfigSectionKey(sec, key)
|
|
if k != nil && k.String() != "" {
|
|
return k.String()
|
|
}
|
|
if len(def) > 0 {
|
|
return def[0]
|
|
}
|
|
return ""
|
|
}
|
|
|
|
// ConfigInheritedKey works like ini.Section.Key(), but it always returns a new key instance, it is O(n) because NewKey is O(n)
|
|
// and the returned key is safe to be used with "MustXxx", it doesn't change the parent's values.
|
|
// Otherwise, ini.Section.Key().MustXxx would pollute the parent section's keys.
|
|
// It never returns nil.
|
|
func ConfigInheritedKey(sec ConfigSection, key string) *ini.Key {
|
|
k := sec.Key(key)
|
|
if k != nil && k.String() != "" {
|
|
newKey, _ := sec.NewKey(k.Name(), k.String())
|
|
return newKey
|
|
}
|
|
newKey, _ := sec.NewKey(key, "")
|
|
return newKey
|
|
}
|
|
|
|
func ConfigInheritedKeyString(sec ConfigSection, key string, def ...string) string {
|
|
k := sec.Key(key)
|
|
if k != nil && k.String() != "" {
|
|
return k.String()
|
|
}
|
|
if len(def) > 0 {
|
|
return def[0]
|
|
}
|
|
return ""
|
|
}
|
|
|
|
type iniFileConfigProvider struct {
|
|
opts *Options
|
|
*ini.File
|
|
newFile bool // whether the file has not existed previously
|
|
}
|
|
|
|
// NewConfigProviderFromData this function is only for testing
|
|
func NewConfigProviderFromData(configContent string) (ConfigProvider, error) {
|
|
var cfg *ini.File
|
|
var err error
|
|
if configContent == "" {
|
|
cfg = ini.Empty()
|
|
} else {
|
|
cfg, err = ini.Load(strings.NewReader(configContent))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
cfg.NameMapper = ini.SnackCase
|
|
return &iniFileConfigProvider{
|
|
File: cfg,
|
|
newFile: true,
|
|
}, nil
|
|
}
|
|
|
|
type Options struct {
|
|
CustomConf string // the ini file path
|
|
AllowEmpty bool // whether not finding configuration files is allowed (only true for the tests)
|
|
ExtraConfig string
|
|
DisableLoadCommonSettings bool
|
|
}
|
|
|
|
// newConfigProviderFromFile load configuration from file.
|
|
// NOTE: do not print any log except error.
|
|
func newConfigProviderFromFile(opts *Options) (*iniFileConfigProvider, error) {
|
|
cfg := ini.Empty()
|
|
newFile := true
|
|
|
|
if opts.CustomConf != "" {
|
|
isFile, err := util.IsFile(opts.CustomConf)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("unable to check if %s is a file. Error: %v", opts.CustomConf, err)
|
|
}
|
|
if isFile {
|
|
if err := cfg.Append(opts.CustomConf); err != nil {
|
|
return nil, fmt.Errorf("failed to load custom conf '%s': %v", opts.CustomConf, err)
|
|
}
|
|
newFile = false
|
|
}
|
|
}
|
|
|
|
if newFile && !opts.AllowEmpty {
|
|
return nil, fmt.Errorf("unable to find configuration file: %q, please ensure you are running in the correct environment or set the correct configuration file with -c", CustomConf)
|
|
}
|
|
|
|
if opts.ExtraConfig != "" {
|
|
if err := cfg.Append([]byte(opts.ExtraConfig)); err != nil {
|
|
return nil, fmt.Errorf("unable to append more config: %v", err)
|
|
}
|
|
}
|
|
|
|
cfg.NameMapper = ini.SnackCase
|
|
return &iniFileConfigProvider{
|
|
opts: opts,
|
|
File: cfg,
|
|
newFile: newFile,
|
|
}, nil
|
|
}
|
|
|
|
func (p *iniFileConfigProvider) Section(section string) ConfigSection {
|
|
return p.File.Section(section)
|
|
}
|
|
|
|
func (p *iniFileConfigProvider) NewSection(name string) (ConfigSection, error) {
|
|
return p.File.NewSection(name)
|
|
}
|
|
|
|
func (p *iniFileConfigProvider) GetSection(name string) (ConfigSection, error) {
|
|
return p.File.GetSection(name)
|
|
}
|
|
|
|
// Save save the content into file
|
|
func (p *iniFileConfigProvider) Save() error {
|
|
if p.opts.CustomConf == "" {
|
|
if !p.opts.AllowEmpty {
|
|
return fmt.Errorf("custom config path must not be empty")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
if p.newFile {
|
|
if err := os.MkdirAll(filepath.Dir(CustomConf), os.ModePerm); err != nil {
|
|
return fmt.Errorf("failed to create '%s': %v", CustomConf, err)
|
|
}
|
|
}
|
|
if err := p.SaveTo(p.opts.CustomConf); err != nil {
|
|
return fmt.Errorf("failed to save '%s': %v", p.opts.CustomConf, err)
|
|
}
|
|
|
|
// Change permissions to be more restrictive
|
|
fi, err := os.Stat(CustomConf)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to determine current conf file permissions: %v", err)
|
|
}
|
|
|
|
if fi.Mode().Perm() > 0o600 {
|
|
if err = os.Chmod(CustomConf, 0o600); err != nil {
|
|
log.Warn("Failed changing conf file permissions to -rw-------. Consider changing them manually.")
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// a file is an implementation ConfigProvider and other implementations are possible, i.e. from docker, k8s, …
|
|
var _ ConfigProvider = &iniFileConfigProvider{}
|
|
|
|
func mustMapSetting(rootCfg ConfigProvider, sectionName string, setting interface{}) {
|
|
if err := rootCfg.Section(sectionName).MapTo(setting); err != nil {
|
|
log.Fatal("Failed to map %s settings: %v", sectionName, err)
|
|
}
|
|
}
|
|
|
|
func deprecatedSetting(rootCfg ConfigProvider, oldSection, oldKey, newSection, newKey, version string) {
|
|
if rootCfg.Section(oldSection).HasKey(oldKey) {
|
|
log.Error("Deprecated fallback `[%s]` `%s` present. Use `[%s]` `%s` instead. This fallback will be/has been removed in %s", oldSection, oldKey, newSection, newKey, version)
|
|
}
|
|
}
|
|
|
|
// deprecatedSettingDB add a hint that the configuration has been moved to database but still kept in app.ini
|
|
func deprecatedSettingDB(rootCfg ConfigProvider, oldSection, oldKey string) {
|
|
if rootCfg.Section(oldSection).HasKey(oldKey) {
|
|
log.Error("Deprecated `[%s]` `%s` present which has been copied to database table sys_setting", oldSection, oldKey)
|
|
}
|
|
}
|