Pull request 2352: AGDNS-2690-signal-handler
Merge in DNS/adguard-home from AGDNS-2690-signal-handler to master
Squashed commit of the following:
commit b6822142312ac814e7c206218bb079a4f364192a
Merge: f597ea1fd 8b2ab8ea8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 3 18:10:27 2025 +0300
Merge branch 'master' into AGDNS-2690-signal-handler
commit f597ea1fd27c1153f2b08a339fd17361807627e6
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Feb 27 20:45:55 2025 +0300
all: fix logger
commit 582e315ecac45e49e156bddb5755f5fb7114111c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Feb 27 18:40:57 2025 +0300
home: imp code
commit 1e0f48d32a654b71a9c0a9e3cf3afceab00bc7e5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Feb 27 15:26:19 2025 +0300
home: imp docs
commit aa43bbc1b20392429d606de5cfd1b1fed940755a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 24 17:24:33 2025 +0300
home: signal handler
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,6 +205,7 @@ 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.
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user