Skip to content

Commit 55a1411

Browse files
committed
do reconfigure manually
1 parent d7ac685 commit 55a1411

File tree

3 files changed

+3
-22
lines changed

3 files changed

+3
-22
lines changed

src/viam/sdk/module/service.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,10 @@ struct ModuleService::ServiceImpl : viam::module::v1::ModuleService::Service {
116116
"unable to reconfigure resource " + cfg.resource_name().name() +
117117
" as it doesn't exist.");
118118
}
119-
try {
120-
Reconfigurable::reconfigure_if_reconfigurable(res, deps, cfg);
121-
res->set_log_level(cfg.get_log_level());
119+
120+
if (auto reconfigurable = std::dynamic_pointer_cast<Reconfigurable>(res)) {
121+
reconfigurable->reconfigure(deps, cfg);
122122
return grpc::Status();
123-
} catch (const std::exception& exc) {
124-
return grpc::Status(::grpc::INTERNAL, exc.what());
125123
}
126124

127125
// if the type isn't reconfigurable by default, replace it

src/viam/sdk/resource/reconfigurable.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,5 @@ namespace sdk {
88
Reconfigurable::~Reconfigurable() = default;
99
Reconfigurable::Reconfigurable() = default;
1010

11-
void Reconfigurable::reconfigure_if_reconfigurable(const std::shared_ptr<Resource>& resource,
12-
const Dependencies& deps,
13-
const ResourceConfig& cfg) {
14-
auto reconfigurable_res = std::dynamic_pointer_cast<Reconfigurable>(resource);
15-
if (reconfigurable_res) {
16-
reconfigurable_res->reconfigure(deps, cfg);
17-
}
18-
}
19-
2011
} // namespace sdk
2112
} // namespace viam

src/viam/sdk/resource/reconfigurable.hpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@ class Reconfigurable {
1515
/// @param cfg The resource's config.
1616
virtual void reconfigure(const Dependencies& deps, const ResourceConfig& cfg) = 0;
1717

18-
/// @brief Reconfigures a resource if it is Reconfigurable.
19-
/// @param resource the Resource to reconfigure.
20-
/// @param deps Dependencies of the resource.
21-
/// @param cfg The resource's config.
22-
static void reconfigure_if_reconfigurable(const std::shared_ptr<Resource>& resource,
23-
const Dependencies& deps,
24-
const ResourceConfig& cfg);
25-
2618
protected:
2719
explicit Reconfigurable();
2820
};

0 commit comments

Comments
 (0)