mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-08 14:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert the logging bit, as that messes with unit tests in CI

Browse source
This commit is contained in:
Neil Alexander 2022-07-12 12:56:16 +01:00
parent d1fe6c41b5
commit b13ca0c0e4
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cmd/generate-config/main.go
View file

@ -50,6 +50,15 @@ func main() {
cfg.Global.DatabaseOptions.ConnectionString = config.DataSource(*dbURI) cfg.Global.DatabaseOptions.ConnectionString = config.DataSource(*dbURI)
} }
} }
cfg.Logging = []config.LogrusHook{
{
Type: "file",
Level: "info",
Params: map[string]interface{}{
"path": "/var/log/dendrite",
},
},
}
if *defaultsForCI { if *defaultsForCI {
cfg.AppServiceAPI.DisableTLSValidation = true cfg.AppServiceAPI.DisableTLSValidation = true
cfg.ClientAPI.RateLimiting.Enabled = false cfg.ClientAPI.RateLimiting.Enabled = false

12
setup/config/config.go
View file

@ -304,18 +304,6 @@ type DefaultOpts struct {
func (c *Dendrite) Defaults(opts DefaultOpts) { func (c *Dendrite) Defaults(opts DefaultOpts) {
c.Version = Version c.Version = Version
if opts.Generate {
c.Logging = []LogrusHook{
{
Type: "file",
Level: "info",
Params: map[string]interface{}{
"path": "/var/log",
},
},
}
}
c.Global.Defaults(opts) c.Global.Defaults(opts)
c.ClientAPI.Defaults(opts) c.ClientAPI.Defaults(opts)
c.FederationAPI.Defaults(opts) c.FederationAPI.Defaults(opts)