Skip to content

Commit

Permalink
Add details in NewError function
Browse files Browse the repository at this point in the history
  • Loading branch information
muzzammilshahid committed Jun 29, 2024
1 parent 1168098 commit ac01c41
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
9 changes: 5 additions & 4 deletions dealer.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ func (d *Dealer) ReceiveMessage(sessionID int64, msg messages.Message) (*Message
call := msg.(*messages.Call)
regs, exists := d.registrationsByProcedure[call.Procedure()]
if !exists || len(regs.Registrants) == 0 {
callErr := messages.NewError(messages.MessageTypeCall, call.RequestID(), "wamp.error.no_such_procedure",
nil, nil)
callErr := messages.NewError(messages.MessageTypeCall, call.RequestID(), map[string]any{},
"wamp.error.no_such_procedure", nil, nil)
return &MessageWithRecipient{Message: callErr, Recipient: sessionID}, nil
}

Expand Down Expand Up @@ -153,7 +153,7 @@ func (d *Dealer) ReceiveMessage(sessionID int64, msg messages.Message) (*Message
registration, exists := d.registrationsByProcedure[register.Procedure()]
if exists {
// TODO: implement shared registrations
err := messages.NewError(messages.MessageTypeRegister, register.RequestID(),
err := messages.NewError(messages.MessageTypeRegister, register.RequestID(), map[string]any{},
"wamp.error.procedure_already_exists", nil, nil)
return &MessageWithRecipient{Message: err, Recipient: sessionID}, nil
} else {
Expand Down Expand Up @@ -200,7 +200,8 @@ func (d *Dealer) ReceiveMessage(sessionID int64, msg messages.Message) (*Message

delete(d.pendingCalls, sessionID)

wErr = messages.NewError(pending.RequestID, messages.MessageTypeCall, wErr.URI(), wErr.Args(), wErr.KwArgs())
wErr = messages.NewError(pending.RequestID, messages.MessageTypeCall, map[string]any{}, wErr.URI(),
wErr.Args(), wErr.KwArgs())
return &MessageWithRecipient{Message: wErr, Recipient: pending.CallerID}, nil
default:
return nil, fmt.Errorf("dealer: received unexpected message of type %T", msg)
Expand Down
4 changes: 3 additions & 1 deletion messages/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,12 @@ type Error struct {

func NewErrorWithFields(fields ErrorFields) *Error { return &Error{ErrorFields: fields} }

func NewError(messageType, requestID int64, uri string, args []any, kwArgs map[string]any) *Error {
func NewError(messageType, requestID int64, details map[string]any, uri string, args []any,
kwArgs map[string]any) *Error {
return &Error{ErrorFields: &errorFields{
messageType: messageType,
requestID: requestID,
details: details,
uri: uri,
args: args,
kwArgs: kwArgs,
Expand Down

0 comments on commit ac01c41

Please sign in to comment.