1048ebcfee561aaa44c3ac4a1f9da058335794bc,src/python/pants/java/nailgun_executor.py,NailgunExecutor,_await_socket,#NailgunExecutor#Any#,204

Before Change

        // TODO: share the decreasing timeout logic here with NailgunProtocol.iter_chunks() by adding
        // a method to pants.util.contextutil!
        remaining_time = time.time() - (start_time + timeout)
        if remaining_time > 0:
          stderr = read_file(self._ng_stderr, binary_mode=True)
          raise self.InitialNailgunConnectTimedOut(
            timeout=timeout,
            stdout=accumulated_stdout,
            stderr=stderr,
          )

        readable, _, _ = select.select([ng_stdout], [], [], (-1 * remaining_time))
        if readable:
          line = ng_stdout.readline()                          // TODO: address deadlock risk here.
          try:

After Change

          possibly_raise_timeout(remaining_time)
          events = selector.select(timeout=-1 * remaining_time)
          if events:
            line = ng_stdout.readline()  // TODO: address deadlock risk here.
            try:
              return self._NG_PORT_REGEX.match(line).group(1)
            except AttributeError:
              pass
            accumulated_stdout += line
    else:
      with safe_open(self._ng_stdout, "r") as ng_stdout:
        while 1:
          remaining_time = calculate_remaining_time()

Instances