5ee0e817393363bdbdce356f6ab971b04e0ea387,src/python/pants/java/nailgun_protocol.py,NailgunProtocol,iter_chunks,#Any#Any#Any#Any#,254

Before Change

    orig_timeout_time = None
    timeout_interval = None
    while 1:
      if orig_timeout_time is not None:
        remaining_time = time.time() - (orig_timeout_time + timeout_interval)
        if remaining_time > 0:
          original_timestamp = datetime.datetime.fromtimestamp(orig_timeout_time).isoformat()
          raise cls.ProcessStreamTimeout(
            "iterating over bytes from nailgun timed out with timeout interval {} starting at {}, "
            "overtime seconds: {}"
            .format(timeout_interval, original_timestamp, remaining_time))
      elif timeout_object is not None:
        opts = timeout_object.maybe_timeout_options()
        if opts:
          orig_timeout_time = opts.start_time
          timeout_interval = opts.interval
          continue
        remaining_time = None
      else:
        remaining_time = None

      with cls._set_socket_timeout(sock, timeout=remaining_time):
        chunk_type, payload = cls.read_chunk(sock, return_bytes)
        yield chunk_type, payload
        if chunk_type == ChunkType.EXIT:

After Change

        // We poll with low timeouts because we poll under a lock. This allows the DaemonPantsRunner
        // to shut down the socket, and us to notice, pretty quickly.
        with cls._set_socket_timeout(maybe_shutdown_socket.socket, timeout=0.01):
          try:
            chunk_type, payload = cls.read_chunk(maybe_shutdown_socket.socket, return_bytes)
          except socket.timeout:
            // Timeouts are handled by the surrounding loop
            continue
      yield chunk_type, payload
      if chunk_type == ChunkType.EXIT:
        break

Instances