mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-22 13:05:36 +03:00
c0a33ce708
Squashed commit of the following: commit 463811748fa5a1f52e084c782e94f268b00b3abc Merge: 3de62244e130560b10
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Jul 10 15:06:01 2024 +0300 Merge remote-tracking branch 'origin/master' into upd-dnsproxy commit 3de62244ee10fce9fb97c73c2955479883ce34eb Merge: e2de50bf9e269260fb
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Jul 10 09:13:40 2024 +0300 Merge remote-tracking branch 'origin/master' into upd-dnsproxy commit e2de50bf9cf4eddaa0d87c20c8c1605bf4630fce Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Jul 10 09:11:25 2024 +0300 home: todos commit58fe497eec
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Jul 9 13:29:19 2024 +0300 home: imp code commit4db7cdc0c4
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Jul 9 11:31:12 2024 +0300 all: imp code commit7e8d3b50e7
Merge:559c3b79d
9a6dd0dc5
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Jul 8 10:56:14 2024 +0300 Merge remote-tracking branch 'origin/master' into upd-dnsproxy commit559c3b79d7
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Jul 8 10:54:03 2024 +0300 dnsforward: imp code commitba4a7e1c70
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Jul 8 10:49:46 2024 +0300 aghos: imp code commitcdf9ccd371
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Jul 5 16:19:27 2024 +0300 all: partial revert slog logger usage commitf16cddbb8c
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Jul 5 13:01:37 2024 +0300 all: upd dnsproxy commit5932c8d102
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Jul 5 11:49:37 2024 +0300 dnsforward: slog logger commit3d7f734ac9
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Jul 5 11:05:14 2024 +0300 all: slog logger commit9a74d5d98b
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Jul 4 12:16:21 2024 +0300 all: upd dnsproxy commit537bdacec8
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Jul 4 12:10:30 2024 +0300 all: upd dnsproxy commit38e10dee48
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Jul 4 10:37:50 2024 +0300 dnsforward: upstream mode
129 lines
3.1 KiB
Go
129 lines
3.1 KiB
Go
package home
|
|
|
|
import (
|
|
"cmp"
|
|
"fmt"
|
|
"log/slog"
|
|
"path/filepath"
|
|
"runtime"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghos"
|
|
"github.com/AdguardTeam/golibs/log"
|
|
"github.com/AdguardTeam/golibs/logutil/slogutil"
|
|
"gopkg.in/natefinch/lumberjack.v2"
|
|
"gopkg.in/yaml.v3"
|
|
)
|
|
|
|
// configSyslog is used to indicate that syslog or eventlog (win) should be used
|
|
// for logger output.
|
|
const configSyslog = "syslog"
|
|
|
|
// newSlogLogger returns new [*slog.Logger] configured with the given settings.
|
|
func newSlogLogger(ls *logSettings) (l *slog.Logger) {
|
|
if !ls.Enabled {
|
|
return slogutil.NewDiscardLogger()
|
|
}
|
|
|
|
return slogutil.New(&slogutil.Config{
|
|
Format: slogutil.FormatAdGuardLegacy,
|
|
AddTimestamp: true,
|
|
Verbose: ls.Verbose,
|
|
})
|
|
}
|
|
|
|
// configureLogger configures logger level and output.
|
|
func configureLogger(ls *logSettings) (err error) {
|
|
// Configure logger level.
|
|
if !ls.Enabled {
|
|
log.SetLevel(log.OFF)
|
|
} else if ls.Verbose {
|
|
log.SetLevel(log.DEBUG)
|
|
}
|
|
|
|
// Make sure that we see the microseconds in logs, as networking stuff can
|
|
// happen pretty quickly.
|
|
log.SetFlags(log.LstdFlags | log.Lmicroseconds)
|
|
|
|
// Write logs to stdout by default.
|
|
if ls.File == "" {
|
|
return nil
|
|
}
|
|
|
|
if ls.File == configSyslog {
|
|
// Use syslog where it is possible and eventlog on Windows.
|
|
err = aghos.ConfigureSyslog(serviceName)
|
|
if err != nil {
|
|
return fmt.Errorf("cannot initialize syslog: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
logFilePath := ls.File
|
|
if !filepath.IsAbs(logFilePath) {
|
|
logFilePath = filepath.Join(Context.workDir, logFilePath)
|
|
}
|
|
|
|
log.SetOutput(&lumberjack.Logger{
|
|
Filename: logFilePath,
|
|
Compress: ls.Compress,
|
|
LocalTime: ls.LocalTime,
|
|
MaxBackups: ls.MaxBackups,
|
|
MaxSize: ls.MaxSize,
|
|
MaxAge: ls.MaxAge,
|
|
})
|
|
|
|
return err
|
|
}
|
|
|
|
// getLogSettings returns a log settings object properly initialized from opts.
|
|
func getLogSettings(opts options) (ls *logSettings) {
|
|
configLogSettings := config.Log
|
|
|
|
ls = readLogSettings()
|
|
if ls == nil {
|
|
// Use default log settings.
|
|
ls = &configLogSettings
|
|
}
|
|
|
|
// Command-line arguments can override config settings.
|
|
if opts.verbose {
|
|
ls.Verbose = true
|
|
}
|
|
|
|
ls.File = cmp.Or(opts.logFile, ls.File)
|
|
|
|
if opts.runningAsService && ls.File == "" && runtime.GOOS == "windows" {
|
|
// When running as a Windows service, use eventlog by default if
|
|
// nothing else is configured. Otherwise, we'll lose the log output.
|
|
ls.File = configSyslog
|
|
}
|
|
|
|
return ls
|
|
}
|
|
|
|
// readLogSettings reads logging settings from the config file. We do it in a
|
|
// separate method in order to configure logger before the actual configuration
|
|
// is parsed and applied.
|
|
func readLogSettings() (ls *logSettings) {
|
|
// TODO(s.chzhen): Add a helper function that returns default parameters
|
|
// for this structure and for the global configuration structure [config].
|
|
conf := &configuration{
|
|
Log: logSettings{
|
|
// By default, it is true if the property does not exist.
|
|
Enabled: true,
|
|
},
|
|
}
|
|
|
|
yamlFile, err := readConfigFile()
|
|
if err != nil {
|
|
return nil
|
|
}
|
|
|
|
err = yaml.Unmarshal(yamlFile, conf)
|
|
if err != nil {
|
|
log.Error("Couldn't get logging settings from the configuration: %s", err)
|
|
}
|
|
|
|
return &conf.Log
|
|
}
|