home: imp code

Author: EugeneOne1

internal/home/home.go

@@ -740,21 +740,48 @@ func run(
 	mux := http.NewServeMux()
 	httpReg := aghhttp.NewDefaultRegistrar(mux, mw.wrap)
 
-	confModifier, tlsMgr := initFiltering(
-		ctx,
-		baseLogger,
-		opts,
-		isFirstRun,
-		sigHdlr,
+	err := setupContext(ctx, baseLogger, opts, workDir, confPath, isFirstRun)
+	fatalOnError(err)
+
+	err = configureOS(config)
+	fatalOnError(err)
+
+	// Clients package uses filtering package's static data
+	// (filtering.BlockedSvcKnown()), so we have to initialize filtering static
+	// data first, but also to avoid relying on automatic Go init() function.
+	filtering.InitModule(ctx, baseLogger)
+
+	confModifier := newDefaultConfigModifier(
+		config,
+		baseLogger.With(slogutil.KeyPrefix, "config_modifier"),
 		workDir,
 		confPath,
+	)
+
+	err = initContextClients(ctx, baseLogger, sigHdlr, confModifier, httpReg, workDir)
+	fatalOnError(err)
+
+	tlsMgr, err := initTLS(ctx, baseLogger, sigHdlr, confModifier, httpReg)
+	fatalOnError(err)
+
+	err = setupDNSFilteringConf(
+		ctx,
+		baseLogger,
+		config.Filtering,
+		tlsMgr,
+		confModifier,
 		httpReg,
+		workDir,
 	)
+	fatalOnError(err)
+
+	err = setupOpts(opts)
+	fatalOnError(err)
 
 	upd, isCustomURL := initUpdate(ctx, baseLogger, opts, tlsMgr, isFirstRun, workDir, confPath)
 
 	dataDirPath := filepath.Join(workDir, dataDir)
-	err := os.MkdirAll(dataDirPath, aghos.DefaultPermDir)
+	err = os.MkdirAll(dataDirPath, aghos.DefaultPermDir)
 	fatalOnError(errors.Annotate(err, "creating DNS data dir at %s: %w", dataDirPath))
 
 	auth, err := initUsers(ctx, baseLogger, workDir, opts.glinetMode)
@@ -836,41 +863,16 @@ func runDNSServer(
 	}
 }
 
-// initFiltering configures the core filtering and TLS subsystems.  Returns a
-// configuration modifier and the initialized TLS manager.  slogLogger, sigHdlr
-// and httpReg must not be nil.
-func initFiltering(
+// initTLS initializes TLS manager.  baseLogger, sigHdlr, confModifier, and
+// httpReg must not be nil.
+func initTLS(
 	ctx context.Context,
-	slogLogger *slog.Logger,
-	opts options,
-	isFirstRun bool,
+	baseLogger *slog.Logger,
 	sigHdlr *signalHandler,
-	workDir string,
-	confPath string,
+	confModifier *defaultConfigModifier,
 	httpReg *aghhttp.DefaultRegistrar,
-) (confModifier *defaultConfigModifier, tlsMgr *tlsManager) {
-	err := setupContext(ctx, slogLogger, opts, workDir, confPath, isFirstRun)
-	fatalOnError(err)
-
-	err = configureOS(config)
-	fatalOnError(err)
-
-	// Clients package uses filtering package's static data
-	// (filtering.BlockedSvcKnown()), so we have to initialize filtering static
-	// data first, but also to avoid relying on automatic Go init() function.
-	filtering.InitModule(ctx, slogLogger)
-
-	confModifier = newDefaultConfigModifier(
-		config,
-		slogLogger.With(slogutil.KeyPrefix, "config_modifier"),
-		workDir,
-		confPath,
-	)
-
-	err = initContextClients(ctx, slogLogger, sigHdlr, confModifier, httpReg, workDir)
-	fatalOnError(err)
-
-	tlsMgrLogger := slogLogger.With(slogutil.KeyPrefix, "tls_manager")
+) (tlsMgr *tlsManager, err error) {
+	tlsMgrLogger := baseLogger.With(slogutil.KeyPrefix, "tls_manager")
 
 	var watcher aghos.FSWatcher
 	watcher, err = aghos.NewOSWatcher(&aghos.OSWatcherConfig{
@@ -882,11 +884,13 @@ func initFiltering(
 	}
 
 	aghtlsMgr := aghtls.NewDefaultManager(&aghtls.DefaultManagerConfig{
-		Logger:  slogLogger.With(slogutil.KeyPrefix, "aghtls_manager"),
+		Logger:  baseLogger.With(slogutil.KeyPrefix, "aghtls_manager"),
 		Watcher: watcher,
 	})
 	err = aghtlsMgr.Start(ctx)
-	fatalOnError(err)
+	if err != nil {
+		return nil, fmt.Errorf("starting tls manager: %w", err)
+	}
 
 	sigHdlr.addTLSManager(aghtlsMgr)
 
@@ -905,21 +909,7 @@ func initFiltering(
 
 	confModifier.setTLSManager(tlsMgr)
 
-	err = setupDNSFilteringConf(
-		ctx,
-		slogLogger,
-		config.Filtering,
-		tlsMgr,
-		confModifier,
-		httpReg,
-		workDir,
-	)
-	fatalOnError(err)
-
-	err = setupOpts(opts)
-	fatalOnError(err)
-
-	return confModifier, tlsMgr
+	return tlsMgr, nil
 }
 
 // initUpdate configures and runs update of this application.  logger and tlsMgr