Change my mind on *msgbus.Message vs. msgbus.Message

This commit is contained in:
James Mills 2022-04-05 12:42:46 +10:00
parent f79a1b6a1e
commit 2d731e0393
No known key found for this signature in database
GPG Key ID: AC4C014F1440EBD6
3 changed files with 7 additions and 7 deletions

View File

@ -36,7 +36,7 @@ var (
ErrConnectionFailed = errors.New("error: connection failed")
)
func noopHandler(msg msgbus.Message) error { return nil }
func noopHandler(msg *msgbus.Message) error { return nil }
// Client ...
type Client struct {
@ -213,7 +213,7 @@ func (s *Subscriber) url() string {
return u.String()
}
func (s *Subscriber) maybeUpdateIndex(msg msgbus.Message) {
func (s *Subscriber) maybeUpdateIndex(msg *msgbus.Message) {
s.Lock()
defer s.Unlock()
@ -260,7 +260,7 @@ func (s *Subscriber) Run(ctx context.Context) error {
return fmt.Errorf("error connecting: %w", err)
}
msgs := make(chan msgbus.Message)
msgs := make(chan *msgbus.Message)
go s.writeloop(ctx, conn)
go s.readloop(ctx, conn, msgs)
@ -305,9 +305,9 @@ func (s *Subscriber) writeloop(ctx context.Context, conn *websocket.Conn) {
}
}
func (s *Subscriber) readloop(ctx context.Context, conn *websocket.Conn, msgs chan msgbus.Message) {
func (s *Subscriber) readloop(ctx context.Context, conn *websocket.Conn, msgs chan *msgbus.Message) {
for {
var msg msgbus.Message
var msg *msgbus.Message
err := wsjson.Read(ctx, conn, &msg)
if err != nil {
log.WithError(err).Debug("read error, reconnecting")

View File

@ -65,7 +65,7 @@ func init() {
}
func handler(command string, args []string) msgbus.HandlerFunc {
return func(msg msgbus.Message) error {
return func(msg *msgbus.Message) error {
out, err := json.Marshal(msg)
if err != nil {
log.Printf("error marshalling message: %s", err)

View File

@ -53,7 +53,7 @@ var upgrader = websocket.Upgrader{
}
// HandlerFunc ...
type HandlerFunc func(msg Message) error
type HandlerFunc func(msg *Message) error
// Topic ...
type Topic struct {