From 3871a466fa21ed7ecb6a7b1d1d5ef4d14b736a48 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 2 Dec 2024 11:45:35 +0200
Subject: Add tenant id to tenant service notifications and callbacks

---
 mod/mod-ci.cxx | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

(limited to 'mod/mod-ci.cxx')

diff --git a/mod/mod-ci.cxx b/mod/mod-ci.cxx
index 52f4644..46fbf6a 100644
--- a/mod/mod-ci.cxx
+++ b/mod/mod-ci.cxx
@@ -422,8 +422,10 @@ handle (request& rq, response& rs)
 }
 
 #ifdef BREP_CI_TENANT_SERVICE
-function<optional<string> (const brep::tenant_service&)> brep::ci::
-build_queued (const tenant_service&,
+function<optional<string> (const string& tenant_id,
+                           const brep::tenant_service&)> brep::ci::
+build_queued (const string& /*tenant_id*/,
+              const tenant_service&,
               const vector<build>& bs,
               optional<build_state> initial_state,
               const build_queued_hints& hints,
@@ -437,7 +439,8 @@ build_queued (const tenant_service&,
                 << hints.single_package_version << ' '
                 << hints.single_package_config;});
 
-  return [&bs, initial_state] (const tenant_service& ts)
+  return [&bs, initial_state] (const string& tenant_id,
+                               const tenant_service& ts)
          {
            optional<string> r (ts.data);
 
@@ -446,6 +449,7 @@ build_queued (const tenant_service&,
              string s ((!initial_state
                         ? "queued "
                         : "queued " + to_string (*initial_state) + ' ') +
+                       tenant_id + '/'                                  +
                        b.package_name.string () + '/'                   +
                        b.package_version.string () + '/'                +
                        b.target.string () + '/'                         +
@@ -467,14 +471,18 @@ build_queued (const tenant_service&,
          };
 }
 
-function<optional<string> (const brep::tenant_service&)> brep::ci::
-build_building (const tenant_service&,
+function<optional<string> (const string& tenant_id,
+                           const brep::tenant_service&)> brep::ci::
+build_building (const string& /*tenant_id*/,
+                const tenant_service&,
                 const build& b,
                 const diag_epilogue&) const noexcept
 {
-  return [&b] (const tenant_service& ts)
+  return [&b] (const string& tenant_id,
+               const tenant_service& ts)
          {
            string s ("building "                       +
+                     tenant_id + '/'                   +
                      b.package_name.string () + '/'    +
                      b.package_version.string () + '/' +
                      b.target.string () + '/'          +
@@ -487,14 +495,17 @@ build_building (const tenant_service&,
          };
 }
 
-function<optional<string> (const brep::tenant_service&)> brep::ci::
-build_built (const tenant_service&,
+function<optional<string> (const string& tenant_id,
+                           const brep::tenant_service&)> brep::ci::
+build_built (const string& /*tenant_id*/,
+             const tenant_service&,
              const build& b,
              const diag_epilogue&) const noexcept
 {
-  return [&b] (const tenant_service& ts)
+  return [&b] (const string& tenant_id, const tenant_service& ts)
          {
            string s ("built "                          +
+                     tenant_id + '/'                   +
                      b.package_name.string () + '/'    +
                      b.package_version.string () + '/' +
                      b.target.string () + '/'          +
-- 
cgit v1.1