Use logging internal string formatting
Markus Gerstel
2 years ago
| 180 | 180 | if not self.has_finished(): |
| 181 | 181 | if self._debug: |
| 182 | 182 | logger.debug( |
| 183 | "NBSR join after %f seconds, underrun not resolved" | |
| 184 | % (timeit.default_timer() - underrun_debug_timer) | |
| 183 | "NBSR join after %f seconds, underrun not resolved", | |
| 184 | timeit.default_timer() - underrun_debug_timer, | |
| 185 | 185 | ) |
| 186 | 186 | raise Exception("thread did not terminate") |
| 187 | 187 | if self._debug: |
| 188 | 188 | logger.debug( |
| 189 | "NBSR underrun resolved after %f seconds" | |
| 190 | % (timeit.default_timer() - underrun_debug_timer) | |
| 189 | "NBSR underrun resolved after %f seconds", | |
| 190 | timeit.default_timer() - underrun_debug_timer, | |
| 191 | 191 | ) |
| 192 | 192 | if self._closed: |
| 193 | 193 | raise Exception("streamreader double-closed") |
| 232 | 232 | raise |
| 233 | 233 | self._buffer_pos += len(block) |
| 234 | 234 | if debug: |
| 235 | logger.debug("wrote %d bytes to stream" % len(block)) | |
| 235 | logger.debug("wrote %d bytes to stream", len(block)) | |
| 236 | 236 | self._stream.close() |
| 237 | 237 | self._terminated = True |
| 238 | 238 | if notify: |
| 526 | 526 | (timeout is None) or (timeit.default_timer() < max_time) |
| 527 | 527 | ): |
| 528 | 528 | if debug and timeout is not None: |
| 529 | logger.debug("still running (T%.2fs)" % (timeit.default_timer() - max_time)) | |
| 529 | logger.debug("still running (T%.2fs)", timeit.default_timer() - max_time) | |
| 530 | 530 | |
| 531 | 531 | # wait for some time or until a stream is closed |
| 532 | 532 | try: |
| 560 | 560 | # timeout condition |
| 561 | 561 | timeout_encountered = True |
| 562 | 562 | if debug: |
| 563 | logger.debug("timeout (T%.2fs)" % (timeit.default_timer() - max_time)) | |
| 563 | logger.debug("timeout (T%.2fs)", timeit.default_timer() - max_time) | |
| 564 | 564 | |
| 565 | 565 | # send terminate signal and wait some time for buffers to be read |
| 566 | 566 | p.terminate() |
| 586 | 586 | runtime = timeit.default_timer() - start_time |
| 587 | 587 | if timeout is not None: |
| 588 | 588 | logger.debug( |
| 589 | "Process ended after %.1f seconds with exit code %d (T%.2fs)" | |
| 590 | % (runtime, p.returncode, timeit.default_timer() - max_time) | |
| 589 | "Process ended after %.1f seconds with exit code %d (T%.2fs)", | |
| 590 | runtime, | |
| 591 | p.returncode, | |
| 592 | timeit.default_timer() - max_time, | |
| 591 | 593 | ) |
| 592 | 594 | else: |
| 593 | 595 | logger.debug( |
| 594 | "Process ended after %.1f seconds with exit code %d" | |
| 595 | % (runtime, p.returncode) | |
| 596 | "Process ended after %.1f seconds with exit code %d", runtime, p.returncode | |
| 596 | 597 | ) |
| 597 | 598 | |
| 598 | 599 | stdout = stdout.get_output() |