Restarting log poll if it fails in another place
Small style tweaks
Merge remote-tracking branch 'origin/master'