jobs: Allow turning on/off log streaming by the job

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/pakfire/daemon.c b/src/pakfire/daemon.c
index 057c1858a901c2a9cc9768252434ed0acb123807..ee877290145105d2a382c1e5d7f5eef5c10ea358 100644 (file)
--- a/src/pakfire/daemon.c
+++ b/src/pakfire/daemon.c
@@ -525,9 +525,6 @@ static int pakfire_daemon_job(struct pakfire_daemon* daemon, json_object* m) {
        // Increment the number of running jobs
        daemon->running_jobs++;
 
-       // XXX For now, we always enabled log streaming
-       pakfire_job_launch_log_stream(job);
-
 ERROR:
        if (job)
                pakfire_job_unref(job);

diff --git a/src/pakfire/job.c b/src/pakfire/job.c
index 736937680599897da70c80e6cab4b5d65a0da609..008b52cd254fe4cc739d69eb039023f92037be18 100644 (file)
--- a/src/pakfire/job.c
+++ b/src/pakfire/job.c
@@ -989,6 +989,14 @@ int pakfire_job_handle_message(struct pakfire_job* self, struct json_object* mes
                return r;
        }
 
+       // Launch log stream
+       if (pakfire_string_equals(command, "launch-log-stream"))
+               return pakfire_job_launch_log_stream(self);
+
+       // Terminate log stream
+       else if (pakfire_string_equals(command, "terminate-log-stream"))
+               return pakfire_job_terminate_log_stream(self);
+
        // Abort job
        if (pakfire_string_equals(command, "abort"))
                return pakfire_job_terminate(self, SIGTERM);