Skip to content
Snippets Groups Projects
Commit ea285e37 authored by Julian Rother's avatar Julian Rother
Browse files

Fixed job cancel checks

parent 3fe1ca62
No related branches found
No related tags found
No related merge requests found
......@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
while (1)
{
canceled = ping_job(jobid, "running", "{\"log\": \"%s\"}", jescape(get_avlogbuf()));
if (canceled)
if (canceled == 1)
kill(pid, SIGINT); /* Stop ffmpeg */
poll(&fds, 1, 15000);
if (fds.revents & POLLIN)
......@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
}
waitpid(pid, &ret, 0);
if (canceled && (WEXITSTATUS(ret) == 255 || (WIFSIGNALED(ret) && WTERMSIG(ret) == SIGINT)))
if (canceled == 1 && (WEXITSTATUS(ret) == 255 || (WIFSIGNALED(ret) && WTERMSIG(ret) == SIGINT)))
ping_job(jobid, "finished", "{\"log\": \"%s\"}", jescape(get_avlogbuf()));
else if (WIFSIGNALED(ret))
job_failed("Subprocesses was killed by signal %s (%i)", strsignal(WTERMSIG(ret)), WTERMSIG(ret));
......
......@@ -337,7 +337,7 @@ int main(int argc, char *argv[])
{
canceled = ping_job(jobid, "running", "{\"progress\": %i, \"log\": \"%s\"}", _progress,
jescape(get_avlogbuf()));
if (canceled)
if (canceled == 1)
job_failed("Job canceled");
progress = _progress;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment