Refactor/service framework method shadowing

cmd/cartesi-rollups-advancer/root/root.go

@@ -80,19 +80,21 @@ func run(cmd *cobra.Command, args []string) {
 	defer cancel()
 
 	createInfo := advancer.CreateInfo{
-		CreateInfo: service.CreateInfo{
-			Name:                 config.ServiceAdvancer,
-			LogLevel:             config.ResolveServiceLogLevel(config.ServiceAdvancer, cfg.LogLevel),
-			LogColor:             cfg.LogColor,
-			EnableSignalHandling: true,
-			TelemetryCreate:      true,
-			TelemetryAddress:     cfg.AdvancerTelemetryAddress,
-			PollInterval:         cfg.AdvancerPollingInterval,
+		TickServiceConfigs: service.TickServiceConfigs{
+			PollInterval:   cfg.AdvancerPollingInterval,
+			ServiceConfigs: service.ServiceConfigs{
+				Name:                 config.ServiceAdvancer,
+				LogLevel:             config.ResolveServiceLogLevel(config.ServiceAdvancer, cfg.LogLevel),
+				LogColor:             cfg.LogColor,
+				EnableSignalHandling: true,
+				TelemetryCreate:      true,
+				TelemetryAddress:     cfg.AdvancerTelemetryAddress,
+			},
 		},
 		Config: *cfg,
 	}
-	logger := service.NewServiceLogger(&createInfo.CreateInfo)
-	createInfo.CreateInfo.Logger = logger
+	logger := service.NewServiceLogger(&createInfo.ServiceConfigs)
+	createInfo.ServiceConfigs.Logger = logger
 
 	var err error
 	createInfo.Repository, err = factory.NewRepositoryFromConnectionString(ctx, cfg.DatabaseConnection.Raw())
@@ -101,7 +103,6 @@ func run(cmd *cobra.Command, args []string) {
 
 	advancerService, err := advancer.Create(ctx, &createInfo)
 	cli.CheckErr(logger, err)
-	advancerService.LogConfig(createInfo.Config)
 
 	cli.CheckErr(logger, advancerService.Serve())
 }

cmd/cartesi-rollups-claimer/root/root.go

@@ -81,19 +81,21 @@ func run(cmd *cobra.Command, args []string) {
 	defer cancel()
 
 	createInfo := claimer.CreateInfo{
-		CreateInfo: service.CreateInfo{
-			Name:                 config.ServiceClaimer,
-			LogLevel:             config.ResolveServiceLogLevel(config.ServiceClaimer, cfg.LogLevel),
-			LogColor:             cfg.LogColor,
-			EnableSignalHandling: true,
-			TelemetryCreate:      true,
-			TelemetryAddress:     cfg.ClaimerTelemetryAddress,
-			PollInterval:         cfg.ClaimerPollingInterval,
+		TickServiceConfigs: service.TickServiceConfigs{
+			PollInterval:   cfg.ClaimerPollingInterval,
+			ServiceConfigs: service.ServiceConfigs{
+				Name:                 config.ServiceClaimer,
+				LogLevel:             config.ResolveServiceLogLevel(config.ServiceClaimer, cfg.LogLevel),
+				LogColor:             cfg.LogColor,
+				EnableSignalHandling: true,
+				TelemetryCreate:      true,
+				TelemetryAddress:     cfg.ClaimerTelemetryAddress,
+			},
 		},
 		Config: *cfg,
 	}
-	logger := service.NewServiceLogger(&createInfo.CreateInfo)
-	createInfo.CreateInfo.Logger = logger
+	logger := service.NewServiceLogger(&createInfo.ServiceConfigs)
+	createInfo.ServiceConfigs.Logger = logger
 
 	authOpt, err := config.HTTPAuthorizationOption()
 	cli.CheckErr(logger, err)
@@ -112,7 +114,6 @@ func run(cmd *cobra.Command, args []string) {
 
 	claimerService, err := claimer.Create(ctx, &createInfo)
 	cli.CheckErr(logger, err)
-	claimerService.LogConfig(createInfo.Config)
 
 	err = claimerService.Serve()
 	cli.CheckErr(logger, err)

cmd/cartesi-rollups-evm-reader/root/root.go

@@ -82,7 +82,7 @@ func run(cmd *cobra.Command, args []string) {
 	defer cancel()
 
 	createInfo := evmreader.CreateInfo{
-		CreateInfo: service.CreateInfo{
+		ServiceConfigs: service.ServiceConfigs{
 			Name:                 config.ServiceEvmReader,
 			LogLevel:             config.ResolveServiceLogLevel(config.ServiceEvmReader, cfg.LogLevel),
 			LogColor:             cfg.LogColor,
@@ -92,8 +92,8 @@ func run(cmd *cobra.Command, args []string) {
 		},
 		Config: *cfg,
 	}
-	logger := service.NewServiceLogger(&createInfo.CreateInfo)
-	createInfo.CreateInfo.Logger = logger
+	logger := service.NewServiceLogger(&createInfo.ServiceConfigs)
+	createInfo.ServiceConfigs.Logger = logger
 
 	var err error
 	authOpt, err := config.HTTPAuthorizationOption()
@@ -117,7 +117,6 @@ func run(cmd *cobra.Command, args []string) {
 
 	readerService, err := evmreader.Create(ctx, &createInfo)
 	cli.CheckErr(logger, err)
-	readerService.LogConfig(createInfo.Config)
 
 	cli.CheckErr(logger, readerService.Serve())
 }

cmd/cartesi-rollups-jsonrpc-api/root/root.go

@@ -68,7 +68,7 @@ func run(cmd *cobra.Command, args []string) {
 	defer cancel()
 
 	createInfo := jsonrpc.CreateInfo{
-		CreateInfo: service.CreateInfo{
+		ServiceConfigs: service.ServiceConfigs{
 			Name:                 config.ServiceJsonrpc,
 			LogLevel:             config.ResolveServiceLogLevel(config.ServiceJsonrpc, cfg.LogLevel),
 			LogColor:             cfg.LogColor,
@@ -78,8 +78,8 @@ func run(cmd *cobra.Command, args []string) {
 		},
 		Config: *cfg,
 	}
-	logger := service.NewServiceLogger(&createInfo.CreateInfo)
-	createInfo.CreateInfo.Logger = logger
+	logger := service.NewServiceLogger(&createInfo.ServiceConfigs)
+	createInfo.ServiceConfigs.Logger = logger
 
 	var err error
 	createInfo.Repository, err = factory.NewRepositoryFromConnectionString(ctx, cfg.DatabaseConnection.Raw())
@@ -88,7 +88,6 @@ func run(cmd *cobra.Command, args []string) {
 
 	jsonrpcService, err := jsonrpc.Create(ctx, &createInfo)
 	cli.CheckErr(logger, err)
-	jsonrpcService.LogConfig(createInfo.Config)
 
 	cli.CheckErr(logger, jsonrpcService.Serve())
 }

cmd/cartesi-rollups-node/root/root.go

@@ -150,7 +150,7 @@ func run(cmd *cobra.Command, args []string) {
 	defer cancel()
 
 	createInfo := node.CreateInfo{
-		CreateInfo: service.CreateInfo{
+		ServiceConfigs: service.ServiceConfigs{
 			Name:                 config.ServiceNode,
 			LogLevel:             cfg.LogLevel,
 			LogColor:             cfg.LogColor,
@@ -160,8 +160,8 @@ func run(cmd *cobra.Command, args []string) {
 		},
 		Config: *cfg,
 	}
-	logger := service.NewServiceLogger(&createInfo.CreateInfo)
-	createInfo.CreateInfo.Logger = logger
+	logger := service.NewServiceLogger(&createInfo.ServiceConfigs)
+	createInfo.ServiceConfigs.Logger = logger
 
 	var err error
 	createInfo.ReaderClient, err = newEthClient(ctx, config.ServiceEvmReader)
@@ -183,7 +183,6 @@ func run(cmd *cobra.Command, args []string) {
 
 	nodeService, err := node.Create(ctx, &createInfo)
 	cli.CheckErr(logger, err)
-	nodeService.LogConfig(createInfo.Config)
 
 	cli.CheckErr(logger, nodeService.Serve())
 }

cmd/cartesi-rollups-prt/root/root.go

@@ -69,19 +69,21 @@ func run(cmd *cobra.Command, args []string) {
 	defer cancel()
 
 	createInfo := prt.CreateInfo{
-		CreateInfo: service.CreateInfo{
-			Name:                 config.ServicePrt,
-			LogLevel:             config.ResolveServiceLogLevel(config.ServicePrt, cfg.LogLevel),
-			LogColor:             cfg.LogColor,
-			EnableSignalHandling: true,
-			TelemetryCreate:      true,
-			TelemetryAddress:     cfg.PrtTelemetryAddress,
-			PollInterval:         cfg.PrtPollingInterval,
+		TickServiceConfigs: service.TickServiceConfigs{
+			PollInterval:   cfg.PrtPollingInterval,
+			ServiceConfigs: service.ServiceConfigs{
+				Name:                 config.ServicePrt,
+				LogLevel:             config.ResolveServiceLogLevel(config.ServicePrt, cfg.LogLevel),
+				LogColor:             cfg.LogColor,
+				EnableSignalHandling: true,
+				TelemetryCreate:      true,
+				TelemetryAddress:     cfg.PrtTelemetryAddress,
+			},
 		},
 		Config: *cfg,
 	}
-	logger := service.NewServiceLogger(&createInfo.CreateInfo)
-	createInfo.CreateInfo.Logger = logger
+	logger := service.NewServiceLogger(&createInfo.ServiceConfigs)
+	createInfo.ServiceConfigs.Logger = logger
 
 	var err error
 	authOpt, err := config.HTTPAuthorizationOption()
@@ -101,7 +103,6 @@ func run(cmd *cobra.Command, args []string) {
 
 	prtService, err := prt.Create(ctx, &createInfo)
 	cli.CheckErr(logger, err)
-	prtService.LogConfig(createInfo.Config)
 
 	cli.CheckErr(logger, prtService.Serve())
 }

cmd/cartesi-rollups-validator/root/root.go

@@ -68,19 +68,21 @@ func run(cmd *cobra.Command, args []string) {
 	defer cancel()
 
 	createInfo := validator.CreateInfo{
-		CreateInfo: service.CreateInfo{
-			Name:                 config.ServiceValidator,
-			LogLevel:             config.ResolveServiceLogLevel(config.ServiceValidator, cfg.LogLevel),
-			LogColor:             cfg.LogColor,
-			EnableSignalHandling: true,
-			TelemetryCreate:      true,
-			TelemetryAddress:     cfg.ValidatorTelemetryAddress,
+		TickServiceConfigs: service.TickServiceConfigs{
 			PollInterval:         cfg.ValidatorPollingInterval,
+			ServiceConfigs: service.ServiceConfigs{
+				Name:                 config.ServiceValidator,
+				LogLevel:             config.ResolveServiceLogLevel(config.ServiceValidator, cfg.LogLevel),
+				LogColor:             cfg.LogColor,
+				EnableSignalHandling: true,
+				TelemetryCreate:      true,
+				TelemetryAddress:     cfg.ValidatorTelemetryAddress,
+			},
 		},
 		Config: *cfg,
 	}
-	logger := service.NewServiceLogger(&createInfo.CreateInfo)
-	createInfo.CreateInfo.Logger = logger
+	logger := service.NewServiceLogger(&createInfo.ServiceConfigs)
+	createInfo.ServiceConfigs.Logger = logger
 
 	var err error
 	createInfo.Repository, err = factory.NewRepositoryFromConnectionString(ctx, cfg.DatabaseConnection.Raw())
@@ -89,7 +91,6 @@ func run(cmd *cobra.Command, args []string) {
 
 	validatorService, err := validator.Create(ctx, &createInfo)
 	cli.CheckErr(logger, err)
-	validatorService.LogConfig(createInfo.Config)
 
 	cli.CheckErr(logger, validatorService.Serve())
 }

internal/advancer/advancer.go

@@ -70,15 +70,11 @@ func getUnprocessedInputs(
 // potentially has more work. Callers use this to decide whether to re-tick immediately
 // (via the Reschedule channel) or wait for the next timer/event.
 func (s *Service) Step(ctx context.Context) (bool, error) {
-	// Check for context cancellation or shutdown in progress.
-	// The framework sets Stopping before calling Impl.Stop(), so this
+	// Check for context cancellation or shutdown in progress. This
 	// prevents starting new work while the machine manager is being torn down.
 	if err := ctx.Err(); err != nil {
 		return false, err
 	}
-	if s.IsStopping() {
-		return false, nil
-	}
 
 	// Update the machine manager with any new or disabled applications
 	err := s.machineManager.UpdateMachines(ctx)
@@ -306,7 +302,7 @@ func (s *Service) processInputs(ctx context.Context, app *Application, inputs []
 				"epoch", input.EpochIndex,
 				"index", input.Index,
 				"error", err)
-			s.Cancel() // triggers graceful shutdown of all services
+			s.Stop(true) // triggers graceful shutdown of all services
 			return err
 		}