Browse Source

add action name to error message

pull/4/head
sberk42 4 years ago
parent
commit
74b1ed86d3
  1. 12
      fritzbox_upnp/service.go

12
fritzbox_upnp/service.go

@ -294,7 +294,7 @@ func (a *Action) createCallHttpRequest(actionArgs []ActionArgument) (*http.Reque
// Call an action. // Call an action.
func (a *Action) Call() (Result, error) { func (a *Action) Call() (Result, error) {
return a.CallWithParams([]ActionArgument{}); return a.CallWithArguments([]ActionArgument{});
} }
// Currently only actions without input arguments are supported. // Currently only actions without input arguments are supported.
func (a *Action) CallWithArguments(actionArgs []ActionArgument) (Result, error) { func (a *Action) CallWithArguments(actionArgs []ActionArgument) (Result, error) {
@ -319,12 +319,12 @@ func (a *Action) CallWithArguments(actionArgs []ActionArgument) (Result, error)
// call failed, but we have a password so calculate header and try again // call failed, but we have a password so calculate header and try again
authHeader, err := a.getDigestAuthHeader(wwwAuth, a.service.Device.root.Username, a.service.Device.root.Password) authHeader, err := a.getDigestAuthHeader(wwwAuth, a.service.Device.root.Username, a.service.Device.root.Password)
if err != nil { if err != nil {
return nil, err return nil, errors.New(fmt.Sprintf("%s: %s", a.Name, err.Error))
} }
req, err = a.createCallHttpRequest(actionArgs) req, err = a.createCallHttpRequest(actionArgs)
if err != nil { if err != nil {
return nil, err return nil, errors.New(fmt.Sprintf("%s: %s", a.Name, err.Error))
} }
req.Header.Set("Authorization", authHeader) req.Header.Set("Authorization", authHeader)
@ -332,11 +332,11 @@ func (a *Action) CallWithArguments(actionArgs []ActionArgument) (Result, error)
resp, err = http.DefaultClient.Do(req) resp, err = http.DefaultClient.Do(req)
if err != nil { if err != nil {
return nil, err return nil, errors.New(fmt.Sprintf("%s: %s", a.Name, err.Error))
} }
} else { } else {
return nil, errors.New(fmt.Sprintf("Unauthorized, but no username and password given")) return nil, errors.New(fmt.Sprintf("%s: Unauthorized, but no username and password given", a.Name))
} }
} }
@ -366,7 +366,7 @@ func (a *Action) CallWithArguments(actionArgs []ActionArgument) (Result, error)
} }
} }
} }
return nil, errors.New(errMsg) return nil, errors.New(fmt.Sprintf("%s: %s", a.Name, errMsg))
} }
return a.parseSoapResponse(resp.Body) return a.parseSoapResponse(resp.Body)

Loading…
Cancel
Save