all: sync with master, upd chlog
This commit is contained in:
@@ -36,6 +36,7 @@ type program struct {
|
||||
signals chan os.Signal
|
||||
done chan struct{}
|
||||
opts options
|
||||
sigHdlr *signalHandler
|
||||
}
|
||||
|
||||
// type check
|
||||
@@ -47,7 +48,7 @@ func (p *program) Start(_ service.Service) (err error) {
|
||||
args := p.opts
|
||||
args.runningAsService = true
|
||||
|
||||
go run(args, p.clientBuildFS, p.done)
|
||||
go run(args, p.clientBuildFS, p.done, p.sigHdlr)
|
||||
|
||||
return nil
|
||||
}
|
||||
@@ -204,13 +205,14 @@ func handleServiceControlAction(
|
||||
clientBuildFS fs.FS,
|
||||
signals chan os.Signal,
|
||||
done chan struct{},
|
||||
sigHdlr *signalHandler,
|
||||
) {
|
||||
// Call chooseSystem explicitly to introduce OpenBSD support for service
|
||||
// package. It's a noop for other GOOS values.
|
||||
chooseSystem()
|
||||
|
||||
action := opts.serviceControlAction
|
||||
log.Info(version.Full())
|
||||
log.Info("%s", version.Full())
|
||||
log.Info("service: control action: %s", action)
|
||||
|
||||
if action == "reload" {
|
||||
@@ -244,6 +246,7 @@ func handleServiceControlAction(
|
||||
signals: signals,
|
||||
done: done,
|
||||
opts: runOpts,
|
||||
sigHdlr: sigHdlr,
|
||||
}, svcConfig)
|
||||
if err != nil {
|
||||
log.Fatalf("service: initializing service: %s", err)
|
||||
@@ -336,7 +339,7 @@ AdGuard Home is successfully installed and will automatically start on boot.
|
||||
There are a few more things that must be configured before you can use it.
|
||||
Click on the link below and follow the Installation Wizard steps to finish setup.
|
||||
AdGuard Home is now available at the following addresses:`)
|
||||
printHTTPAddresses(urlutil.SchemeHTTP)
|
||||
printHTTPAddresses(urlutil.SchemeHTTP, nil)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user