letsencrypt
/
boulder
mirror of https://github.com/letsencrypt/boulder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

errorCondition in RPC is for internal errors only (#2275) 

We had a few examplees where we were calling it for errors returned by the
called function, which is not correct.
This commit is contained in:
Jacob Hoffman-Andrews 2016-10-24 12:09:11 -07:00 committed by Roland Bracewell Shoemaker
parent 6b126baa0a
commit e58abdf49b
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rpc/rpc-wrappers.go
View File

@ -220,7 +220,7 @@ func improperMessage(method string, err error, obj interface{}) {
} }
func errorCondition(method string, err error, obj interface{}) { func errorCondition(method string, err error, obj interface{}) {
log := blog.Get() log := blog.Get()
log.AuditErr(fmt.Sprintf("Error condition. method: %s err: %s data: %+v", method, err, obj)) log.AuditErr(fmt.Sprintf("RPC internal error condition. method: %s err: %s data: %+v", method, err, obj))
} }
// NewRegistrationAuthorityServer constructs an RPC server // NewRegistrationAuthorityServer constructs an RPC server
@ -373,10 +373,6 @@ func NewRegistrationAuthorityServer(rpc Server, impl core.RegistrationAuthority,
return return
} }
err = impl.DeactivateAuthorization(ctx, authz) err = impl.DeactivateAuthorization(ctx, authz)
if err != nil {
errorCondition(MethodDeactivateAuthorization, err, req)
return
}
return return
}) })
@ -388,10 +384,6 @@ func NewRegistrationAuthorityServer(rpc Server, impl core.RegistrationAuthority,
return return
} }
err = impl.DeactivateRegistration(ctx, reg) err = impl.DeactivateRegistration(ctx, reg)
if err != nil {
errorCondition(MethodDeactivateRegistration, err, req)
return
}
return return
}) })
@ -1100,7 +1092,6 @@ func NewStorageAuthorityServer(rpc Server, impl core.StorageAuthority) error {
} }
count, err := impl.CountFQDNSets(ctx, r.Window, r.Names) count, err := impl.CountFQDNSets(ctx, r.Window, r.Names)
if err != nil { if err != nil {
errorCondition(MethodCountFQDNSets, err, req)
return return
} }
@ -1122,7 +1113,6 @@ func NewStorageAuthorityServer(rpc Server, impl core.StorageAuthority) error {
} }
exists, err := impl.FQDNSetExists(ctx, r.Names) exists, err := impl.FQDNSetExists(ctx, r.Names)
if err != nil { if err != nil {
errorCondition(MethodFQDNSetExists, err, req)
return return
} }
response, err = json.Marshal(fqdnSetExistsResponse{exists}) response, err = json.Marshal(fqdnSetExistsResponse{exists})
@ -1136,10 +1126,6 @@ func NewStorageAuthorityServer(rpc Server, impl core.StorageAuthority) error {
rpc.Handle(MethodDeactivateAuthorizationSA, func(ctx context.Context, req []byte) (response []byte, err error) { rpc.Handle(MethodDeactivateAuthorizationSA, func(ctx context.Context, req []byte) (response []byte, err error) {
err = impl.DeactivateAuthorization(ctx, string(req)) err = impl.DeactivateAuthorization(ctx, string(req))
if err != nil {
errorCondition(MethodDeactivateAuthorizationSA, err, req)
return
}
return return
}) })
@ -1150,10 +1136,6 @@ func NewStorageAuthorityServer(rpc Server, impl core.StorageAuthority) error {
return return
} }
err = impl.DeactivateRegistration(ctx, drReq.ID) err = impl.DeactivateRegistration(ctx, drReq.ID)
if err != nil {
errorCondition(MethodDeactivateRegistrationSA, err, req)
return
}
return return
}) })