job: Give a reference to the client

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

diff --git a/src/pakfire/builder.c b/src/pakfire/builder.c
index 984d7192167f9f1bc9e04743cbeb3c2c61b127b5..3068dcbf0f8df7c1b597ac8db3e4f9e7b14ccc77 100644 (file)
--- a/src/pakfire/builder.c
+++ b/src/pakfire/builder.c
@@ -568,7 +568,7 @@ static int pakfire_builder_job(struct pakfire_builder* self, json_object* m) {
        }
 
        // Create a new job
-       r = pakfire_job_create(&job, self->ctx, self, data);
+       r = pakfire_job_create(&job, self->ctx, self->client, self, data);
        if (r) {
                ERROR(self->ctx, "Could not create a new job: %s\n", strerror(-r));
                goto ERROR;

diff --git a/src/pakfire/job.c b/src/pakfire/job.c
index c539c975bcedff457a3fc36ce7f9e80a4725eec4..d9b4edaae54aac9dc875e3e9eff9347f9f4a54dd 100644 (file)
--- a/src/pakfire/job.c
+++ b/src/pakfire/job.c
@@ -880,7 +880,7 @@ int pakfire_job_stream_logs(struct pakfire_job* self) {
 }
 
 int pakfire_job_create(struct pakfire_job** job, struct pakfire_ctx* ctx,
-               struct pakfire_builder* builder, json_object* data) {
+               struct pakfire_client* client, struct pakfire_builder* builder, json_object* data) {
        struct pakfire_job* j = NULL;
        int r;
 
@@ -905,10 +905,8 @@ int pakfire_job_create(struct pakfire_job** job, struct pakfire_ctx* ctx,
                goto ERROR;
        }
 
-#if 0
        // Fetch a reference to the client
-       j->client = pakfire_daemon_client(daemon);
-#endif
+       j->client = pakfire_client_ref(client);
 
        // Initialize the PID file descriptor
        j->pidfd = -EBADF;

diff --git a/src/pakfire/job.h b/src/pakfire/job.h
index a930fc7e1f704782dedd1e3bcb0837b5196ad86c..69e28559a03035cb10a862642bf5ff52f3df4211 100644 (file)
--- a/src/pakfire/job.h
+++ b/src/pakfire/job.h
@@ -21,13 +21,16 @@
 #ifndef PAKFIRE_JOB_H
 #define PAKFIRE_JOB_H
 
+#include <json.h>
+
 #include <pakfire/builder.h>
+#include <pakfire/client.h>
 #include <pakfire/ctx.h>
 
 struct pakfire_job;
 
-int pakfire_job_create(struct pakfire_job** worker,
-       struct pakfire_ctx* ctx, struct pakfire_builder* builder, json_object* data);
+int pakfire_job_create(struct pakfire_job** worker, struct pakfire_ctx* ctx,
+       struct pakfire_client* client, struct pakfire_builder* builder, json_object* data);
 
 struct pakfire_job* pakfire_job_ref(struct pakfire_job* worker);
 struct pakfire_job* pakfire_job_unref(struct pakfire_job* worker);