gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-14 18:20:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1936 from nats-io/xacc2

Browse Source 
Properly handle local deliver subjects
This commit is contained in:
Derek Collison
2021-02-24 21:25:23 -07:00
committed by GitHub
parent 954aea16f6 57403b1903
commit cc038a6d95
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/client.go
View File

@@ -3742,12 +3742,12 @@ func (c *client) processServiceImport(si *serviceImport, acc *Account, msg []byt
}
// Pick correct to subject. If we matched on a wildcard use the literal publish subject.
to := si.to
to, subject := si.to, string(c.pa.subject)
if si.tr != nil {
// FIXME(dlc) - This could be slow, may want to look at adding cache to bare transforms?
to, _ = si.tr.transformSubject(string(c.pa.subject))
to, _ = si.tr.transformSubject(subject)
} else if si.usePub {
to = string(c.pa.subject)
to = subject
}
// Now check to see if this account has mappings that could affect the service import.
// Can't use non-locked trick like in processInboundClientMsg, so just call into selectMappedSubject
@@ -3814,15 +3814,21 @@ func (c *client) processServiceImport(si *serviceImport, acc *Account, msg []byt
var didDeliver bool
// Remap to local deliver subject if set.
dsubj := []byte(to)
if len(c.pa.deliver) > 0 {
dsubj = c.pa.deliver
}
// If this is not a gateway connection but gateway is enabled,
// try to send this converted message to all gateways.
if c.srv.gateway.enabled {
flags |= pmrCollectQueueNames
var queues [][]byte
didDeliver, queues = c.processMsgResults(si.acc, rr, msg, nil, []byte(to), nrr, flags)
didDeliver = c.sendMsgToGateways(si.acc, msg, []byte(to), nrr, queues) || didDeliver
didDeliver, queues = c.processMsgResults(si.acc, rr, msg, nil, dsubj, nrr, flags)
didDeliver = c.sendMsgToGateways(si.acc, msg, dsubj, nrr, queues) || didDeliver
} else {
didDeliver, _ = c.processMsgResults(si.acc, rr, msg, nil, []byte(to), nrr, flags)
didDeliver, _ = c.processMsgResults(si.acc, rr, msg, nil, dsubj, nrr, flags)
}
// Put what was there back now.