mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-17 10:58:29 -07:00
3a67cc2c45
Merge in DNS/adguard-home from mk-aghnet to master
Updates #2829.
Squashed commit of the following:
commit 519806c04b8d0517aacce9c31f2d06ab56631937
Merge: 92376c86 97361234
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 16 19:13:56 2021 +0300
Merge branch 'master' into mk-aghnet
commit 92376c8665e529191aa482432f9d5e3e2e3afdc8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 16 18:37:22 2021 +0300
aghnet: fix linux
commit 7f36d19b0e650d4e4fc5cf9ea4b501a7f636abeb
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 16 18:08:30 2021 +0300
aghnet: mv network utils from util
commit aa68c70c1146b8c32303c6e037953a41aa7d72f9
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 16 17:30:06 2021 +0300
aghnet: mv ipDetector here
commit b033657f5c5ee91f869c36508a5eb15976a174a0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 16 17:24:07 2021 +0300
all: mk aghnet package, rename sysutil package
42 lines
1.1 KiB
Go
42 lines
1.1 KiB
Go
// +build windows plan9
|
|
|
|
package aghos
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/AdguardTeam/golibs/log"
|
|
"golang.org/x/sys/windows"
|
|
"golang.org/x/sys/windows/svc/eventlog"
|
|
)
|
|
|
|
type eventLogWriter struct {
|
|
el *eventlog.Log
|
|
}
|
|
|
|
// Write implements io.Writer interface for eventLogWriter.
|
|
func (w *eventLogWriter) Write(b []byte) (int, error) {
|
|
return len(b), w.el.Info(1, string(b))
|
|
}
|
|
|
|
func configureSyslog(serviceName string) error {
|
|
// Note that the eventlog src is the same as the service name
|
|
// Otherwise, we will get "the description for event id cannot be found" warning in every log record
|
|
|
|
// Continue if we receive "registry key already exists" or if we get
|
|
// ERROR_ACCESS_DENIED so that we can log without administrative permissions
|
|
// for pre-existing eventlog sources.
|
|
if err := eventlog.InstallAsEventCreate(serviceName, eventlog.Info|eventlog.Warning|eventlog.Error); err != nil {
|
|
if !strings.Contains(err.Error(), "registry key already exists") && err != windows.ERROR_ACCESS_DENIED {
|
|
return err
|
|
}
|
|
}
|
|
el, err := eventlog.Open(serviceName)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
log.SetOutput(&eventLogWriter{el: el})
|
|
return nil
|
|
}
|