Rewrite logger system (#24726)
## ⚠️ 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>
2023-05-22 01:35:11 +03:00
|
|
|
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
|
|
|
|
package setting
|
|
|
|
|
|
|
|
import (
|
2023-06-02 12:27:30 +03:00
|
|
|
"os"
|
Rewrite logger system (#24726)
## ⚠️ 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>
2023-05-22 01:35:11 +03:00
|
|
|
"testing"
|
|
|
|
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
)
|
|
|
|
|
|
|
|
func TestConfigProviderBehaviors(t *testing.T) {
|
|
|
|
t.Run("BuggyKeyOverwritten", func(t *testing.T) {
|
|
|
|
cfg, _ := NewConfigProviderFromData(`
|
|
|
|
[foo]
|
|
|
|
key =
|
|
|
|
`)
|
|
|
|
sec := cfg.Section("foo")
|
|
|
|
secSub := cfg.Section("foo.bar")
|
|
|
|
secSub.Key("key").MustString("1") // try to read a key from subsection
|
|
|
|
assert.Equal(t, "1", sec.Key("key").String()) // TODO: BUGGY! the key in [foo] is overwritten
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("SubsectionSeeParentKeys", func(t *testing.T) {
|
|
|
|
cfg, _ := NewConfigProviderFromData(`
|
|
|
|
[foo]
|
|
|
|
key = 123
|
|
|
|
`)
|
|
|
|
secSub := cfg.Section("foo.bar.xxx")
|
|
|
|
assert.Equal(t, "123", secSub.Key("key").String())
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestConfigProviderHelper(t *testing.T) {
|
|
|
|
cfg, _ := NewConfigProviderFromData(`
|
|
|
|
[foo]
|
|
|
|
empty =
|
|
|
|
key = 123
|
|
|
|
`)
|
|
|
|
|
|
|
|
sec := cfg.Section("foo")
|
|
|
|
secSub := cfg.Section("foo.bar")
|
|
|
|
|
|
|
|
// test empty key
|
|
|
|
assert.Equal(t, "def", ConfigSectionKeyString(sec, "empty", "def"))
|
|
|
|
assert.Equal(t, "xyz", ConfigSectionKeyString(secSub, "empty", "xyz"))
|
|
|
|
|
|
|
|
// test non-inherited key, only see the keys in current section
|
|
|
|
assert.NotNil(t, ConfigSectionKey(sec, "key"))
|
|
|
|
assert.Nil(t, ConfigSectionKey(secSub, "key"))
|
|
|
|
|
|
|
|
// test default behavior
|
|
|
|
assert.Equal(t, "123", ConfigSectionKeyString(sec, "key"))
|
|
|
|
assert.Equal(t, "", ConfigSectionKeyString(secSub, "key"))
|
|
|
|
assert.Equal(t, "def", ConfigSectionKeyString(secSub, "key", "def"))
|
|
|
|
|
|
|
|
assert.Equal(t, "123", ConfigInheritedKeyString(secSub, "key"))
|
|
|
|
|
|
|
|
// Workaround for ini package's BuggyKeyOverwritten behavior
|
|
|
|
assert.Equal(t, "", ConfigSectionKeyString(sec, "empty"))
|
|
|
|
assert.Equal(t, "", ConfigSectionKeyString(secSub, "empty"))
|
|
|
|
assert.Equal(t, "def", ConfigInheritedKey(secSub, "empty").MustString("def"))
|
|
|
|
assert.Equal(t, "def", ConfigInheritedKey(secSub, "empty").MustString("xyz"))
|
|
|
|
assert.Equal(t, "", ConfigSectionKeyString(sec, "empty"))
|
|
|
|
assert.Equal(t, "def", ConfigSectionKeyString(secSub, "empty"))
|
|
|
|
}
|
2023-06-02 12:27:30 +03:00
|
|
|
|
|
|
|
func TestNewConfigProviderFromFile(t *testing.T) {
|
Refactor path & config system (#25330)
# The problem
There were many "path tricks":
* By default, Gitea uses its program directory as its work path
* Gitea tries to use the "work path" to guess its "custom path" and
"custom conf (app.ini)"
* Users might want to use other directories as work path
* The non-default work path should be passed to Gitea by GITEA_WORK_DIR
or "--work-path"
* But some Gitea processes are started without these values
* The "serv" process started by OpenSSH server
* The CLI sub-commands started by site admin
* The paths are guessed by SetCustomPathAndConf again and again
* The default values of "work path / custom path / custom conf" can be
changed when compiling
# The solution
* Use `InitWorkPathAndCommonConfig` to handle these path tricks, and use
test code to cover its behaviors.
* When Gitea's web server runs, write the WORK_PATH to "app.ini", this
value must be the most correct one, because if this value is not right,
users would find that the web UI doesn't work and then they should be
able to fix it.
* Then all other sub-commands can use the WORK_PATH in app.ini to
initialize their paths.
* By the way, when Gitea starts for git protocol, it shouldn't output
any log, otherwise the git protocol gets broken and client blocks
forever.
The "work path" priority is: WORK_PATH in app.ini > cmd arg --work-path
> env var GITEA_WORK_DIR > builtin default
The "app.ini" searching order is: cmd arg --config > cmd arg "work path
/ custom path" > env var "work path / custom path" > builtin default
## ⚠️ BREAKING
If your instance's "work path / custom path / custom conf" doesn't meet
the requirements (eg: work path must be absolute), Gitea will report a
fatal error and exit. You need to set these values according to the
error log.
----
Close #24818
Close #24222
Close #21606
Close #21498
Close #25107
Close #24981
Maybe close #24503
Replace #23301
Replace #22754
And maybe more
2023-06-21 08:50:26 +03:00
|
|
|
cfg, err := NewConfigProviderFromFile("no-such.ini")
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.True(t, cfg.IsLoadedFromEmpty())
|
2023-06-02 12:27:30 +03:00
|
|
|
|
|
|
|
// load non-existing file and save
|
|
|
|
testFile := t.TempDir() + "/test.ini"
|
|
|
|
testFile1 := t.TempDir() + "/test1.ini"
|
Refactor path & config system (#25330)
# The problem
There were many "path tricks":
* By default, Gitea uses its program directory as its work path
* Gitea tries to use the "work path" to guess its "custom path" and
"custom conf (app.ini)"
* Users might want to use other directories as work path
* The non-default work path should be passed to Gitea by GITEA_WORK_DIR
or "--work-path"
* But some Gitea processes are started without these values
* The "serv" process started by OpenSSH server
* The CLI sub-commands started by site admin
* The paths are guessed by SetCustomPathAndConf again and again
* The default values of "work path / custom path / custom conf" can be
changed when compiling
# The solution
* Use `InitWorkPathAndCommonConfig` to handle these path tricks, and use
test code to cover its behaviors.
* When Gitea's web server runs, write the WORK_PATH to "app.ini", this
value must be the most correct one, because if this value is not right,
users would find that the web UI doesn't work and then they should be
able to fix it.
* Then all other sub-commands can use the WORK_PATH in app.ini to
initialize their paths.
* By the way, when Gitea starts for git protocol, it shouldn't output
any log, otherwise the git protocol gets broken and client blocks
forever.
The "work path" priority is: WORK_PATH in app.ini > cmd arg --work-path
> env var GITEA_WORK_DIR > builtin default
The "app.ini" searching order is: cmd arg --config > cmd arg "work path
/ custom path" > env var "work path / custom path" > builtin default
## ⚠️ BREAKING
If your instance's "work path / custom path / custom conf" doesn't meet
the requirements (eg: work path must be absolute), Gitea will report a
fatal error and exit. You need to set these values according to the
error log.
----
Close #24818
Close #24222
Close #21606
Close #21498
Close #25107
Close #24981
Maybe close #24503
Replace #23301
Replace #22754
And maybe more
2023-06-21 08:50:26 +03:00
|
|
|
cfg, err = NewConfigProviderFromFile(testFile)
|
2023-06-02 12:27:30 +03:00
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
sec, _ := cfg.NewSection("foo")
|
|
|
|
_, _ = sec.NewKey("k1", "a")
|
|
|
|
assert.NoError(t, cfg.Save())
|
|
|
|
_, _ = sec.NewKey("k2", "b")
|
|
|
|
assert.NoError(t, cfg.SaveTo(testFile1))
|
|
|
|
|
|
|
|
bs, err := os.ReadFile(testFile)
|
|
|
|
assert.NoError(t, err)
|
2023-06-21 05:31:40 +03:00
|
|
|
assert.Equal(t, "[foo]\nk1 = a\n", string(bs))
|
2023-06-02 12:27:30 +03:00
|
|
|
|
|
|
|
bs, err = os.ReadFile(testFile1)
|
|
|
|
assert.NoError(t, err)
|
2023-06-21 05:31:40 +03:00
|
|
|
assert.Equal(t, "[foo]\nk1 = a\nk2 = b\n", string(bs))
|
2023-06-02 12:27:30 +03:00
|
|
|
|
|
|
|
// load existing file and save
|
Refactor path & config system (#25330)
# The problem
There were many "path tricks":
* By default, Gitea uses its program directory as its work path
* Gitea tries to use the "work path" to guess its "custom path" and
"custom conf (app.ini)"
* Users might want to use other directories as work path
* The non-default work path should be passed to Gitea by GITEA_WORK_DIR
or "--work-path"
* But some Gitea processes are started without these values
* The "serv" process started by OpenSSH server
* The CLI sub-commands started by site admin
* The paths are guessed by SetCustomPathAndConf again and again
* The default values of "work path / custom path / custom conf" can be
changed when compiling
# The solution
* Use `InitWorkPathAndCommonConfig` to handle these path tricks, and use
test code to cover its behaviors.
* When Gitea's web server runs, write the WORK_PATH to "app.ini", this
value must be the most correct one, because if this value is not right,
users would find that the web UI doesn't work and then they should be
able to fix it.
* Then all other sub-commands can use the WORK_PATH in app.ini to
initialize their paths.
* By the way, when Gitea starts for git protocol, it shouldn't output
any log, otherwise the git protocol gets broken and client blocks
forever.
The "work path" priority is: WORK_PATH in app.ini > cmd arg --work-path
> env var GITEA_WORK_DIR > builtin default
The "app.ini" searching order is: cmd arg --config > cmd arg "work path
/ custom path" > env var "work path / custom path" > builtin default
## ⚠️ BREAKING
If your instance's "work path / custom path / custom conf" doesn't meet
the requirements (eg: work path must be absolute), Gitea will report a
fatal error and exit. You need to set these values according to the
error log.
----
Close #24818
Close #24222
Close #21606
Close #21498
Close #25107
Close #24981
Maybe close #24503
Replace #23301
Replace #22754
And maybe more
2023-06-21 08:50:26 +03:00
|
|
|
cfg, err = NewConfigProviderFromFile(testFile)
|
2023-06-02 12:27:30 +03:00
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.Equal(t, "a", cfg.Section("foo").Key("k1").String())
|
|
|
|
sec, _ = cfg.NewSection("bar")
|
|
|
|
_, _ = sec.NewKey("k1", "b")
|
|
|
|
assert.NoError(t, cfg.Save())
|
|
|
|
bs, err = os.ReadFile(testFile)
|
|
|
|
assert.NoError(t, err)
|
2023-06-21 05:31:40 +03:00
|
|
|
assert.Equal(t, "[foo]\nk1 = a\n\n[bar]\nk1 = b\n", string(bs))
|
2023-06-02 12:27:30 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestNewConfigProviderForLocale(t *testing.T) {
|
|
|
|
// load locale from file
|
|
|
|
localeFile := t.TempDir() + "/locale.ini"
|
|
|
|
_ = os.WriteFile(localeFile, []byte(`k1=a`), 0o644)
|
|
|
|
cfg, err := NewConfigProviderForLocale(localeFile)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.Equal(t, "a", cfg.Section("").Key("k1").String())
|
|
|
|
|
|
|
|
// load locale from bytes
|
|
|
|
cfg, err = NewConfigProviderForLocale([]byte("k1=foo\nk2=bar"))
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.Equal(t, "foo", cfg.Section("").Key("k1").String())
|
|
|
|
cfg, err = NewConfigProviderForLocale([]byte("k1=foo\nk2=bar"), []byte("k2=xxx"))
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.Equal(t, "foo", cfg.Section("").Key("k1").String())
|
|
|
|
assert.Equal(t, "xxx", cfg.Section("").Key("k2").String())
|
|
|
|
}
|
2023-06-21 05:31:40 +03:00
|
|
|
|
|
|
|
func TestDisableSaving(t *testing.T) {
|
|
|
|
testFile := t.TempDir() + "/test.ini"
|
|
|
|
_ = os.WriteFile(testFile, []byte("k1=a\nk2=b"), 0o644)
|
Refactor path & config system (#25330)
# The problem
There were many "path tricks":
* By default, Gitea uses its program directory as its work path
* Gitea tries to use the "work path" to guess its "custom path" and
"custom conf (app.ini)"
* Users might want to use other directories as work path
* The non-default work path should be passed to Gitea by GITEA_WORK_DIR
or "--work-path"
* But some Gitea processes are started without these values
* The "serv" process started by OpenSSH server
* The CLI sub-commands started by site admin
* The paths are guessed by SetCustomPathAndConf again and again
* The default values of "work path / custom path / custom conf" can be
changed when compiling
# The solution
* Use `InitWorkPathAndCommonConfig` to handle these path tricks, and use
test code to cover its behaviors.
* When Gitea's web server runs, write the WORK_PATH to "app.ini", this
value must be the most correct one, because if this value is not right,
users would find that the web UI doesn't work and then they should be
able to fix it.
* Then all other sub-commands can use the WORK_PATH in app.ini to
initialize their paths.
* By the way, when Gitea starts for git protocol, it shouldn't output
any log, otherwise the git protocol gets broken and client blocks
forever.
The "work path" priority is: WORK_PATH in app.ini > cmd arg --work-path
> env var GITEA_WORK_DIR > builtin default
The "app.ini" searching order is: cmd arg --config > cmd arg "work path
/ custom path" > env var "work path / custom path" > builtin default
## ⚠️ BREAKING
If your instance's "work path / custom path / custom conf" doesn't meet
the requirements (eg: work path must be absolute), Gitea will report a
fatal error and exit. You need to set these values according to the
error log.
----
Close #24818
Close #24222
Close #21606
Close #21498
Close #25107
Close #24981
Maybe close #24503
Replace #23301
Replace #22754
And maybe more
2023-06-21 08:50:26 +03:00
|
|
|
cfg, err := NewConfigProviderFromFile(testFile)
|
2023-06-21 05:31:40 +03:00
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
cfg.DisableSaving()
|
|
|
|
err = cfg.Save()
|
|
|
|
assert.ErrorIs(t, err, errDisableSaving)
|
|
|
|
|
|
|
|
saveCfg, err := cfg.PrepareSaving()
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
saveCfg.Section("").Key("k1").MustString("x")
|
|
|
|
saveCfg.Section("").Key("k2").SetValue("y")
|
|
|
|
saveCfg.Section("").Key("k3").SetValue("z")
|
|
|
|
err = saveCfg.Save()
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
bs, err := os.ReadFile(testFile)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.Equal(t, "k1 = a\nk2 = y\nk3 = z\n", string(bs))
|
|
|
|
}
|