Merge pull request #6631 from ethereum-optimism/08-07-catch_panics_and_log_config_failures

feat(indexer): Handle process panics & config failure

indexer/cli/cli.go

@@ -23,15 +23,16 @@ type Cli struct {
 }
 
 func runIndexer(ctx *cli.Context) error {
+	logger := log.NewLogger(log.ReadCLIConfig(ctx))
+
 	configPath := ctx.String(ConfigFlag.Name)
 	cfg, err := config.LoadConfig(configPath)
 	if err != nil {
+		logger.Error("failed to load config", "err", err)
 		return err
 	}
 
-	// setup logger
-	cfg.Logger = log.NewLogger(log.ReadCLIConfig(ctx))
-
+	cfg.Logger = logger
 	indexer, err := indexer.NewIndexer(cfg)
 	if err != nil {
 		return err
@@ -47,17 +48,20 @@ func runIndexer(ctx *cli.Context) error {
 }
 
 func runApi(ctx *cli.Context) error {
-	configPath := ctx.String(ConfigFlag.Name)
-	conf, err := config.LoadConfig(configPath)
-
-	fmt.Println(conf)
+	logger := log.NewLogger(log.ReadCLIConfig(ctx))
 
+	configPath := ctx.String(ConfigFlag.Name)
+	cfg, err := config.LoadConfig(configPath)
 	if err != nil {
-		panic(err)
+		logger.Error("failed to load config", "err", err)
+		return err
 	}
 
+	cfg.Logger = logger
+	fmt.Println(cfg)
+
 	// finish me
-	return nil
+	return err
 }
 
 var (

indexer/indexer.go

@@ -72,21 +72,30 @@ func NewIndexer(cfg config.Config) (*Indexer, error) {
 // Start starts the indexing service on L1 and L2 chains
 func (i *Indexer) Run(ctx context.Context) error {
 	var wg sync.WaitGroup
-	errCh := make(chan error)
+	errCh := make(chan error, 1)
 
 	// If either processor errors out, we stop
 	processorCtx, cancel := context.WithCancel(ctx)
 	run := func(start func(ctx context.Context) error) {
 		wg.Add(1)
-		defer wg.Done()
+		defer func() {
+			if err := recover(); err != nil {
+				i.log.Error("halting indexer on panic", "err", err)
+				errCh <- fmt.Errorf("panic: %v", err)
+			}
+
+			wg.Done()
+		}()
 
 		err := start(processorCtx)
 		if err != nil {
 			i.log.Error("halting indexer on error", "err", err)
-
 			cancel()
-			errCh <- err
 		}
+
+		// Send a value down regardless if we've received an error or halted
+		// via cancellation where err == nil
+		errCh <- err
 	}
 
 	// Kick off the processors