Skip to content

Commit 5815b3c

Browse files
committed
refactor(services): use factory instead initializer to create supervisor
1 parent e3644a7 commit 5815b3c

23 files changed

Lines changed: 47 additions & 68 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,10 @@ func run(cmd *cobra.Command, args []string) {
110110
TelemetryAddress: cfg.AdvancerTelemetryAddress,
111111
Services: services,
112112
}
113-
supervisor := &service.Supervisor{}
114-
err = service.InitServicesSupervisor(supCfg, supervisor)
113+
supervisor, err := service.NewSupervisor(supCfg)
115114
cli.CheckErr(logger, err)
116115

116+
logger.Info("Starting service", "config", cfg)
117+
117118
cli.CheckErr(logger, supervisor.Serve())
118119
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,10 @@ func run(cmd *cobra.Command, args []string) {
122122
TelemetryAddress: cfg.ClaimerTelemetryAddress,
123123
Services: []service.SupervisedService{claimerService},
124124
}
125-
supervisor := &service.Supervisor{}
126-
err = service.InitServicesSupervisor(supCfg, supervisor)
125+
supervisor, err := service.NewSupervisor(supCfg)
127126
cli.CheckErr(logger, err)
128127

128+
logger.Info("Starting service", "config", cfg)
129+
129130
cli.CheckErr(logger, supervisor.Serve())
130131
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,10 @@ func run(cmd *cobra.Command, args []string) {
123123
TelemetryAddress: cfg.EvmReaderTelemetryAddress,
124124
Services: []service.SupervisedService{readerService},
125125
}
126-
supervisor := &service.Supervisor{}
127-
err = service.InitServicesSupervisor(supCfg, supervisor)
126+
supervisor, err := service.NewSupervisor(supCfg)
128127
cli.CheckErr(logger, err)
129128

129+
logger.Info("Starting service", "config", cfg)
130+
130131
cli.CheckErr(logger, supervisor.Serve())
131132
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,10 @@ func run(cmd *cobra.Command, args []string) {
9595
TelemetryAddress: cfg.JsonrpcTelemetryAddress,
9696
Services: []service.SupervisedService{jsonrpcService},
9797
}
98-
supervisor := &service.Supervisor{}
99-
err = service.InitServicesSupervisor(supCfg, supervisor)
98+
supervisor, err := service.NewSupervisor(supCfg)
10099
cli.CheckErr(logger, err)
101100

101+
logger.Info("Starting service", "config", cfg)
102+
102103
cli.CheckErr(logger, supervisor.Serve())
103104
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,5 +187,7 @@ func run(cmd *cobra.Command, args []string) {
187187
nodeService, err := node.Create(ctx, &createInfo)
188188
cli.CheckErr(logger, err)
189189

190+
logger.Info("Starting service", "config", cfg)
191+
190192
cli.CheckErr(logger, nodeService.Serve())
191193
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,10 @@ func run(cmd *cobra.Command, args []string) {
111111
TelemetryAddress: cfg.PrtTelemetryAddress,
112112
Services: []service.SupervisedService{prtService},
113113
}
114-
supervisor := &service.Supervisor{}
115-
err = service.InitServicesSupervisor(supCfg, supervisor)
114+
supervisor, err := service.NewSupervisor(supCfg)
116115
cli.CheckErr(logger, err)
117116

117+
logger.Info("Starting service", "config", cfg)
118+
118119
cli.CheckErr(logger, supervisor.Serve())
119120
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,10 @@ func run(cmd *cobra.Command, args []string) {
9797
TelemetryAddress: cfg.ValidatorTelemetryAddress,
9898
Services: []service.SupervisedService{validatorService},
9999
}
100-
supervisor := &service.Supervisor{}
101-
err = service.InitServicesSupervisor(supCfg, supervisor)
100+
supervisor, err := service.NewSupervisor(supCfg)
102101
cli.CheckErr(logger, err)
103102

103+
logger.Info("Starting service", "config", cfg)
104+
104105
cli.CheckErr(logger, supervisor.Serve())
105106
}

internal/advancer/advancer_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ func newMockAdvancerServiceWithBatchSize(
5757
if err != nil {
5858
return nil, err
5959
}
60-
supCfg := &service.SupervisorConfigs{Services: []service.SupervisedService{s}}
61-
supervisor := &service.Supervisor{}
62-
err = service.InitServicesSupervisor(supCfg, supervisor)
60+
_, err = service.NewSupervisor(&service.SupervisorConfigs{
61+
Services: []service.SupervisedService{s},
62+
})
6363
if err != nil {
6464
return nil, err
6565
}

internal/advancer/service.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,6 @@ func Create(ctx context.Context, c *CreateInfo) ([]service.SupervisedService, er
104104

105105
s.snapshotsDir = c.Config.SnapshotsDir
106106

107-
service.LogConfig(s.Logger, c.Config)
108-
109107
return services, nil
110108
}
111109

internal/claimer/service.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,6 @@ func Create(ctx context.Context, c *CreateInfo) (service.SupervisedService, erro
146146
defaultBlock: nodeConfig.DefaultBlock,
147147
}
148148

149-
service.LogConfig(s.Logger, c.Config)
150-
151149
return s, nil
152150
}
153151

0 commit comments

Comments
 (0)