Fix Timeout logging.

[alexanderrichards]

This patch fixes the failure to output correctly attempts other than the first. It also allows adding extra log information when killing the job through say timeout.