all: log enabled

This commit is contained in:
Stanislav Chzhen 2024-06-20 14:17:08 +03:00
parent 08d863dd3a
commit 7658c9b107
3 changed files with 19 additions and 2 deletions

View File

@ -27,6 +27,11 @@ See also the [v0.107.52 GitHub milestone][ms-v0.107.52].
NOTE: Add new changes BELOW THIS COMMENT. NOTE: Add new changes BELOW THIS COMMENT.
--> -->
### Added
- The ability to disable logging using the new `log.enabled` configuration
property ([#7079]).
### Changed ### Changed
- Frontend rewritten in TypeScript. - Frontend rewritten in TypeScript.
@ -59,6 +64,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
[#7053]: https://github.com/AdguardTeam/AdGuardHome/issues/7053 [#7053]: https://github.com/AdguardTeam/AdGuardHome/issues/7053
[#7069]: https://github.com/AdguardTeam/AdGuardHome/issues/7069 [#7069]: https://github.com/AdguardTeam/AdGuardHome/issues/7069
[#7076]: https://github.com/AdguardTeam/AdGuardHome/issues/7076 [#7076]: https://github.com/AdguardTeam/AdGuardHome/issues/7076
[#7079]: https://github.com/AdguardTeam/AdGuardHome/issues/7079
[install-script]: https://github.com/AdguardTeam/AdGuardHome/?tab=readme-ov-file#automated-install-linux-and-mac [install-script]: https://github.com/AdguardTeam/AdGuardHome/?tab=readme-ov-file#automated-install-linux-and-mac

View File

@ -32,6 +32,9 @@ const dataDir = "data"
// logSettings are the logging settings part of the configuration file. // logSettings are the logging settings part of the configuration file.
type logSettings struct { type logSettings struct {
// Enabled indicates whether logging is enabled.
Enabled bool `yaml:"enabled"`
// File is the path to the log file. If empty, logs are written to stdout. // File is the path to the log file. If empty, logs are written to stdout.
// If "syslog", logs are written to syslog. // If "syslog", logs are written to syslog.
File string `yaml:"file"` File string `yaml:"file"`
@ -454,6 +457,7 @@ var config = &configuration{
}, },
}, },
Log: logSettings{ Log: logSettings{
Enabled: true,
Compress: false, Compress: false,
LocalTime: false, LocalTime: false,
MaxBackups: 0, MaxBackups: 0,

View File

@ -21,7 +21,9 @@ func configureLogger(opts options) (err error) {
ls := getLogSettings(opts) ls := getLogSettings(opts)
// Configure logger level. // Configure logger level.
if ls.Verbose { if !ls.Enabled {
log.SetLevel(log.OFF)
} else if ls.Verbose {
log.SetLevel(log.DEBUG) log.SetLevel(log.DEBUG)
} }
@ -91,7 +93,12 @@ func getLogSettings(opts options) (ls *logSettings) {
// separate method in order to configure logger before the actual configuration // separate method in order to configure logger before the actual configuration
// is parsed and applied. // is parsed and applied.
func readLogSettings() (ls *logSettings) { func readLogSettings() (ls *logSettings) {
conf := &configuration{} conf := &configuration{
Log: logSettings{
// By default, it is true if the property does not exist.
Enabled: true,
},
}
yamlFile, err := readConfigFile() yamlFile, err := readConfigFile()
if err != nil { if err != nil {