Remove sleep from consumer, add shutdown hook