Skip to content
Snippets Groups Projects
Commit c31f027f authored by Joaquim Casals Buñuel's avatar Joaquim Casals Buñuel
Browse files

Fix packages loading @problem::autosetup

parent c16524ef
No related branches found
No related tags found
No related merge requests found
Pipeline #5275 failed
...@@ -127,14 +127,14 @@ ProblemPtr Problem::autoSetup(ParamsServer &_server) ...@@ -127,14 +127,14 @@ ProblemPtr Problem::autoSetup(ParamsServer &_server)
WOLF_WARN(e.what()); WOLF_WARN(e.what());
WOLF_WARN("Support for subscribers disabled..."); WOLF_WARN("Support for subscribers disabled...");
} }
for (auto it : _server.getParam<std::vector<std::string>>("packages")) { for (auto it : _server.getParam<std::vector<std::string>>("packages_subscriber")) {
std::string subscriber = packages_path + "/libsubscriber_" + it + lib_extension; std::string subscriber = packages_path + "/libsubscriber_" + it + lib_extension;
WOLF_TRACE("Loading subscriber " + subscriber); WOLF_TRACE("Loading subscriber " + subscriber);
auto l = new LoaderRaw(subscriber); auto l = new LoaderRaw(subscriber);
l->load(); l->load();
loaders.push_back(l); loaders.push_back(l);
} }
for (auto it : _server.getParam<std::vector<std::string>>("packages")) { for (auto it : _server.getParam<std::vector<std::string>>("packages_publisher")) {
std::string subscriber = packages_path + "/libpublisher_" + it + lib_extension; std::string subscriber = packages_path + "/libpublisher_" + it + lib_extension;
WOLF_TRACE("Loading publisher " + subscriber); WOLF_TRACE("Loading publisher " + subscriber);
auto l = new LoaderRaw(subscriber); auto l = new LoaderRaw(subscriber);
......
...@@ -475,21 +475,25 @@ void ParserYAML::parse() ...@@ -475,21 +475,25 @@ void ParserYAML::parse()
tags.push_back("processor"); tags.push_back("processor");
walkTreeR(it.n_, tags, "processor/" + it.name_); walkTreeR(it.n_, tags, "processor/" + it.name_);
} }
std::list<std::string> plugins, packages; std::list<std::string> plugins;
std::list<std::string> packages_subscriber, packages_publisher;
for (const auto& it : paramsSens_) for (const auto& it : paramsSens_)
plugins.push_back(it.plugin_); plugins.push_back(it.plugin_);
for (const auto& it : paramsProc_) for (const auto& it : paramsProc_)
plugins.push_back(it.plugin_); plugins.push_back(it.plugin_);
for (const auto& it : subscriber_managers_) for (const auto& it : subscriber_managers_)
packages.push_back(it.package_); packages_subscriber.push_back(it.package_);
for (const auto& it : publisher_managers_) for (const auto& it : publisher_managers_)
packages.push_back(it.package_); packages_publisher.push_back(it.package_);
plugins.sort(); plugins.sort();
plugins.unique(); plugins.unique();
packages.sort(); packages_subscriber.sort();
packages.unique(); packages_subscriber.unique();
packages_publisher.sort();
packages_publisher.unique();
insert_register("plugins", wolf::converter<std::string>::convert(plugins)); insert_register("plugins", wolf::converter<std::string>::convert(plugins));
insert_register("packages", wolf::converter<std::string>::convert(packages)); insert_register("packages_subscriber", wolf::converter<std::string>::convert(packages_subscriber));
insert_register("packages_publisher", wolf::converter<std::string>::convert(packages_publisher));
YAML::Node n; YAML::Node n;
n = loadYAML(generatePath(file_)); n = loadYAML(generatePath(file_));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment