Forráskód Böngészése

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

George Kadianakis 12 éve
szülő
commit
8c3a4a1d21
2 módosított fájl, 16 hozzáadás és 1 törlés
  1. 3 0
      changes/bug5099
  2. 13 1
      src/or/transports.c

+ 3 - 0
changes/bug5099

@@ -0,0 +1,3 @@
+  o Minor features:
+    - Improve log message issued when a managed proxy fails to
+      launch. Resolves ticket 5099.

+ 13 - 1
src/or/transports.c

@@ -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;
   }