Commit 8c3a4a1d authored by George Kadianakis's avatar George Kadianakis Committed by Nick Mathewson
Browse files

Improve log message issued when a managed proxy fails to launch.

parent ebda15e4
Loading
Loading
Loading
Loading

changes/bug5099

0 → 100644
+3 −0
Original line number Diff line number Diff line
  o Minor features:
    - Improve log message issued when a managed proxy fails to
      launch. Resolves ticket 5099.
+13 −1
Original line number Diff line number Diff line
@@ -697,7 +697,19 @@ handle_proxy_line(const char *line, managed_proxy_t *mp)

    return;
  } else if (!strcmpstart(line, SPAWN_ERROR_MESSAGE)) {
    log_warn(LD_GENERAL, "Could not launch managed proxy executable!");
    /* managed proxy launch failed: parse error message to learn why. */
    int retval, child_state, saved_errno;
    retval = tor_sscanf(line, SPAWN_ERROR_MESSAGE "%x/%x",
                        &child_state, &saved_errno);
    if (retval == 2) {
      log_warn(LD_GENERAL,
               "Could not launch managed proxy executable at '%s' ('%s').",
               mp->argv[0], strerror(saved_errno));
    } else { /* failed to parse error message */
      log_warn(LD_GENERAL,"Could not launch managed proxy executable at '%s'.",
               mp->argv[0]);
    }

    mp->conf_state = PT_PROTO_FAILED_LAUNCH;
    return;
  }