Add tenant id to tenant service notifications and callbacks

1 files changed, 5 insertions, 4 deletions

diff --git a/mod/mod-build-result.cxx b/mod/mod-build-result.cxx
index bc44bd2..cc058b5 100644
--- a/mod/mod-build-result.cxx
+++ b/mod/mod-build-result.cxx
@@ -545,14 +545,15 @@ handle (request& rq, response&)
     //
     conn.reset ();
 
-    if (auto f = tsq->build_queued (ss,
+    if (auto f = tsq->build_queued (qbs.back ().tenant,
+                                    ss,
                                     qbs,
                                     build_state::building,
                                     qhs,
                                     log_writer_))
     {
       conn = build_db_->connection ();
-      update_tenant_service_state (conn, qbs.back ().tenant, f);
+      update_tenant_service_state (conn, ss.type, ss.id, f);
     }
   }
 
@@ -572,10 +573,10 @@ handle (request& rq, response&)
     //
     conn.reset ();
 
-    if (auto f = tsb->build_built (ss, b, log_writer_))
+    if (auto f = tsb->build_built (b.tenant, ss, b, log_writer_))
     {
       conn = build_db_->connection ();
-      update_tenant_service_state (conn, b.tenant, f);
+      update_tenant_service_state (conn, ss.type, ss.id, f);
     }
   }