Skip to content

Commit

Permalink
Merge pull request #23 from kpetremann/fix_conn_not_kept
Browse files Browse the repository at this point in the history
fix: conn not closed properly
  • Loading branch information
kpetremann authored May 13, 2023
2 parents 0ceeec3 + b7aca08 commit ea57dc9
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions pkg/events/listener.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,25 @@ type EventListener struct {
decoder *msgpack.Decoder
}

func (e *EventListener) Open() net.Conn {
func (e *EventListener) Open() {
log.Info().Msg("connecting to salt-master event bus")
var eventBus net.Conn
var err error

for {
select {
case <-e.ctx.Done():
return nil
return
default:
}

eventBus, err = net.Dial("unix", "/var/run/salt/master/master_event_pub.ipc")
e.saltEventBus, err = net.Dial("unix", "/var/run/salt/master/master_event_pub.ipc")
if err != nil {
log.Error().Msg("failed to connect to event bus, retrying in 5 seconds")
time.Sleep(time.Second * 5)
} else {
log.Info().Msg("successfully connected to event bus")
e.decoder = msgpack.NewDecoder(eventBus)
return eventBus
e.decoder = msgpack.NewDecoder(e.saltEventBus)
return
}
}
}
Expand Down

0 comments on commit ea57dc9

Please sign in to comment.