@@ -113,31 +113,23 @@ func Main(clientBuildFS fs.FS) {
113113 signals := make (chan os.Signal , 1 )
114114 signal .Notify (signals , syscall .SIGINT , syscall .SIGTERM , syscall .SIGHUP , syscall .SIGQUIT )
115115
116- go func () {
117- ctx := context .Background ()
118- for {
119- sig := <- signals
120- log .Info ("Received signal %q" , sig )
121- switch sig {
122- case syscall .SIGHUP :
123- globalContext .clients .storage .ReloadARP (ctx )
124- globalContext .tls .reload ()
125- default :
126- cleanup (ctx )
127- cleanupAlways ()
128- close (done )
129- }
130- }
131- }()
116+ ctx := context .Background ()
117+ sigHdlr := newSignalHandler (signals , func (ctx context.Context ) {
118+ cleanup (ctx )
119+ cleanupAlways ()
120+ close (done )
121+ })
122+
123+ go sigHdlr .handle (ctx )
132124
133125 if opts .serviceControlAction != "" {
134- handleServiceControlAction (opts , clientBuildFS , signals , done )
126+ handleServiceControlAction (opts , clientBuildFS , signals , done , sigHdlr )
135127
136128 return
137129 }
138130
139131 // run the protection
140- run (opts , clientBuildFS , done )
132+ run (opts , clientBuildFS , done , sigHdlr )
141133}
142134
143135// setupContext initializes [globalContext] fields. It also reads and upgrades
@@ -278,7 +270,11 @@ func setupOpts(opts options) (err error) {
278270}
279271
280272// initContextClients initializes Context clients and related fields.
281- func initContextClients (ctx context.Context , logger * slog.Logger ) (err error ) {
273+ func initContextClients (
274+ ctx context.Context ,
275+ logger * slog.Logger ,
276+ sigHdlr * signalHandler ,
277+ ) (err error ) {
282278 err = setupDNSFilteringConf (ctx , logger , config .Filtering )
283279 if err != nil {
284280 // Don't wrap the error, because it's informative enough as is.
@@ -313,6 +309,7 @@ func initContextClients(ctx context.Context, logger *slog.Logger) (err error) {
313309 globalContext .etcHosts ,
314310 arpDB ,
315311 config .Filtering ,
312+ sigHdlr ,
316313 )
317314}
318315
@@ -583,7 +580,7 @@ func fatalOnError(err error) {
583580// run configures and starts AdGuard Home.
584581//
585582// TODO(e.burkov): Make opts a pointer.
586- func run (opts options , clientBuildFS fs.FS , done chan struct {}) {
583+ func run (opts options , clientBuildFS fs.FS , done chan struct {}, sigHdlr * signalHandler ) {
587584 // Configure working dir.
588585 err := initWorkingDir (opts )
589586 fatalOnError (err )
@@ -599,6 +596,7 @@ func run(opts options, clientBuildFS fs.FS, done chan struct{}) {
599596
600597 // TODO(a.garipov): Use slog everywhere.
601598 slogLogger := newSlogLogger (ls )
599+ sigHdlr .swapLogger (slogLogger )
602600
603601 // Print the first message after logger is configured.
604602 log .Info (version .Full ())
@@ -621,7 +619,7 @@ func run(opts options, clientBuildFS fs.FS, done chan struct{}) {
621619 // TODO(s.chzhen): Use it for the entire initialization process.
622620 ctx := context .Background ()
623621
624- err = initContextClients (ctx , slogLogger )
622+ err = initContextClients (ctx , slogLogger , sigHdlr )
625623 fatalOnError (err )
626624
627625 err = setupOpts (opts )
@@ -664,6 +662,8 @@ func run(opts options, clientBuildFS fs.FS, done chan struct{}) {
664662 onConfigModified ()
665663 }
666664
665+ sigHdlr .addTLSManager (globalContext .tls )
666+
667667 globalContext .web , err = initWeb (ctx , opts , clientBuildFS , upd , slogLogger , customURL )
668668 fatalOnError (err )
669669
0 commit comments