Only check for timeout if time_limit is finite, and don't consider timed logging if output_flag is false; formatted

Only check for timeout if time_limit is finite, and don't consider timed logging if output_flag is false; formatted #1148