Adapt to split of event and signal handling in daemonlib