consul: detach executeKeyringOp() from *Internal

pull/336/head
Ryan Uber 10 years ago
parent 59a7938d1f
commit 25845a39d3

@ -81,11 +81,11 @@ func (m *Internal) KeyringOperation(
dc := m.srv.config.Datacenter dc := m.srv.config.Datacenter
respLAN, err := m.doKeyringOperation(args, m.srv.KeyManagerLAN()) respLAN, err := executeKeyringOp(args, m.srv.KeyManagerLAN())
ingestKeyringResponse(respLAN, reply, dc, false, err) ingestKeyringResponse(respLAN, reply, dc, false, err)
if !args.Forwarded { if !args.Forwarded {
respWAN, err := m.doKeyringOperation(args, m.srv.KeyManagerWAN()) respWAN, err := executeKeyringOp(args, m.srv.KeyManagerWAN())
ingestKeyringResponse(respWAN, reply, dc, true, err) ingestKeyringResponse(respWAN, reply, dc, true, err)
args.Forwarded = true args.Forwarded = true
@ -95,7 +95,10 @@ func (m *Internal) KeyringOperation(
return nil return nil
} }
func (m *Internal) doKeyringOperation( // executeKeyringOp executes the appropriate keyring-related function based on
// the type of keyring operation in the request. It takes the KeyManager as an
// argument, so it can handle any operation for either LAN or WAN pools.
func executeKeyringOp(
args *structs.KeyringRequest, args *structs.KeyringRequest,
mgr *serf.KeyManager) (r *serf.KeyResponse, err error) { mgr *serf.KeyManager) (r *serf.KeyResponse, err error) {

Loading…
Cancel
Save