Can't relay to non-default ports on destination server

[Eric Ziegenhorn]

carbon-relay will not relay to carbon-cache if carbon-cache is running on a non-standard port. In particular, relay.py does not compare server names to the list of servers to relay to correctly when port numbers are involved. I've attached a patch that makes it compare straight sever names _or_ servername:portnumber (this was the missing part) to the list of cache servers. Now it works for me.

I've attached a patch against lib/carbon/relay.py which modifies a single line.

[chrismd (chrismd)]

Fix committed. Thanks for the patch.

[Eric Ziegenhorn (ziggy)]

Actually, that one-liner works but is too lax due to not paying attention to operator precedence. It should be:

    if server.host in destinations or "%s:%s" % (server.host, server.port) in destinations:

instead of :

    if server.host or "%s:%s" % (server.host, server.port) in destinations: