Skip to content

Commit 4e5053f

Browse files
committed
[refactoring] Improve error handling
1 parent ebf077b commit 4e5053f

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

internal/app/controller/controller.go

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func NewGameController() (c *GameController) {
3535

3636
c = new(GameController)
3737
c.Config = loadConfig()
38-
c.Publisher = loadPublisher(c.Config)
38+
c.Publisher = NewPublisher(c.Config.Network.PublishAddress)
3939
c.ApiServer = ApiServer{}
4040
c.ApiServer.Consumer = c
4141

@@ -174,15 +174,6 @@ func (c *GameController) OnNewEvent(event Event) {
174174
}
175175
}
176176

177-
// loadPublisher creates a new publisher for multicast
178-
func loadPublisher(config config.Controller) Publisher {
179-
publisher, err := NewPublisher(config.Network.PublishAddress)
180-
if err != nil {
181-
log.Printf("Could not start publisher on %v. %v", config.Network.PublishAddress, err)
182-
}
183-
return publisher
184-
}
185-
186177
// loadConfig loads the controller config
187178
func loadConfig() config.Controller {
188179
cfg, err := config.LoadControllerConfig(configFileName)

internal/app/controller/publisher.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,31 @@ type RefMessage struct {
2323
}
2424

2525
// NewPublisher creates a new publisher that publishes referee messages via UDP to the teams
26-
func NewPublisher(address string) (publisher Publisher, err error) {
26+
func NewPublisher(address string) (publisher Publisher) {
2727

2828
publisher.address = address
2929

3030
// initialize default referee message
3131
publisher.message = RefMessage{send: publisher.send, referee: new(refproto.Referee)}
3232
initRefereeMessage(publisher.message.referee)
3333

34-
err = publisher.connect()
34+
publisher.connect()
3535

3636
return
3737
}
3838

39-
func (p *Publisher) connect() (err error) {
39+
func (p *Publisher) connect() {
4040
p.conn = nil
4141

4242
addr, err := net.ResolveUDPAddr("udp", p.address)
4343
if err != nil {
44+
log.Printf("Could not resolve address '%v': %v", p.address, err)
4445
return
4546
}
4647

4748
conn, err := net.DialUDP("udp", nil, addr)
4849
if err != nil {
50+
log.Printf("Could not connect to '%v': %v", addr, err)
4951
return
5052
}
5153

0 commit comments

Comments
 (0)