Rolling RMQ poller out to contract and factory