* Remove the custom retry exception, since it blocks fluentd
* Add ensure clauses on shutdown and retry cases