@@ -258,9 +258,7 @@ handle_info({_, {exit_status, _Status}}, S) -> {stop, worker_exit(S, {job_error, M}), S}; handle_info({_, closed}, S) -> - M = "Worker killed. Last words:\n" ++ errlines(S), - event(S, "ERROR", M), - {stop, worker_exit(S, {job_error, M}), S}; + {stop, worker_exit(S, {job_error, "Worker killed"}), S}; handle_info(timeout, #state{linecount = 0} = S) -> M = "Worker didn't start in 30 seconds", @@ -268,14 +266,10 @@ handle_info(timeout, #state{linecount = 0} = S) -> {stop, worker_exit(S, {data_error, M}), S}; handle_info({'DOWN', _, _, _, _}, S) -> - M = "Worker killed. Last words:\n" ++ errlines(S), - event(S, "ERROR", M), - {stop, worker_exit(S, {job_error, M}), S}. + {stop, worker_exit(S, {job_error, "Worker killed"}), S}. handle_cast(kill_worker, S) -> - M = "Worker killed. Last words:\n" ++ errlines(S), - event(S, "ERROR", M), - {stop, worker_exit(S, {job_error, M}), S}. + {stop, worker_exit(S, {job_error, "Worker killed"}), S}. terminate(_Reason, State) -> % Possible bug: If we end up here before knowing child_pid, the master/src/disco_worker.erl 1013a7614a5c8e7c7b8fb2f1efe195b0b4b993a6 Ville Tuulos tuulos@dxfront.(none) http://github.com/tuulos/disco/commit/54eaa9ffeed3b3bd2690acb69d1fbcaa92646f52 54eaa9ffeed3b3bd2690acb69d1fbcaa92646f52 2009-10-04T21:26:43-07:00 2009-10-04T21:20:42-07:00 Don't print out "Worker killed" messages for every killed task which can easily hide the traceback from the first failing task 648a1234aa574615ce79becfaa6a9f1a75891ca6 Ville Tuulos tuulos@dxfront.(none)