fixed bug in client dependencies

mochi-hpc · Feb 5, 2024 · a4d88ca · a4d88ca
1 parent 1850943
commit a4d88ca
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/examples/module-b.cpp b/examples/module-b.cpp
@@ -11,11 +11,16 @@ class ServiceBFactory : public bedrock::AbstractServiceFactory {
     public:
 
     ServiceBFactory() {
-        m_provider_dependencies.push_back({ "ssg_group", "ssg", BEDROCK_REQUIRED });
-        m_provider_dependencies.push_back({ "mona_instance", "mona", BEDROCK_REQUIRED });
-        m_provider_dependencies.push_back({ "a_provider", "module_a", BEDROCK_REQUIRED });
-        m_provider_dependencies.push_back({ "a_local", "module_a", BEDROCK_REQUIRED | BEDROCK_ARRAY});
-        m_provider_dependencies.push_back({ "a_client", "module_a", BEDROCK_REQUIRED });
+        m_provider_dependencies.push_back({
+            "ssg_group", "ssg", BEDROCK_REQUIRED });
+        m_provider_dependencies.push_back({
+            "mona_instance", "mona", BEDROCK_REQUIRED });
+        m_provider_dependencies.push_back({
+            "a_provider", "module_a", BEDROCK_REQUIRED | BEDROCK_KIND_PROVIDER});
+        m_provider_dependencies.push_back({
+            "a_provider_handle", "module_a", BEDROCK_REQUIRED | BEDROCK_ARRAY | BEDROCK_KIND_PROVIDER_HANDLE});
+        m_provider_dependencies.push_back({
+            "a_client", "module_a", BEDROCK_REQUIRED | BEDROCK_KIND_CLIENT});
     }
 
     void* registerProvider(const bedrock::FactoryArgs& args) override {

diff --git a/include/bedrock/AbstractServiceFactory.hpp b/include/bedrock/AbstractServiceFactory.hpp
@@ -276,7 +276,7 @@ class AbstractServiceFactory {
      */
     virtual std::vector<Dependency> getClientDependencies(const char* config) {
         (void)config;
-        return getProviderDependencies();
+        return getClientDependencies();
     }
 };
 

diff --git a/src/ClientManager.cpp b/src/ClientManager.cpp
@@ -280,8 +280,8 @@ ClientManager::addClientFromJSON(const std::string& jsonString) {
                 }
             }
         } else if (dependency.flags & BEDROCK_REQUIRED) {
-            throw DETAILED_EXCEPTION("Missing dependency {} in configuration",
-                            dependency.name);
+            throw DETAILED_EXCEPTION("Missing client dependency \"{}\" of type \"{}\" in configuration",
+                            dependency.name, dependency.type);
         }
     }
 

diff --git a/src/ProviderManager.cpp b/src/ProviderManager.cpp
@@ -285,8 +285,8 @@ ProviderManager::addProviderFromJSON(const std::string& jsonString) {
                 }
             }
         } else if (dependency.flags & BEDROCK_REQUIRED) {
-            throw DETAILED_EXCEPTION("Missing dependency {} in configuration",
-                            dependency.name);
+            throw DETAILED_EXCEPTION("Missing provider dependency \"{}\" of type \"{}\" in configuration",
+                            dependency.name, dependency.type);
         }
     }