EntityManager: Rename isDetectedPowerOn for clarity
This is about the configuration at hand, not directly about the current
host power state.
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: Id602f6a7374b2a4b6316df81583b062d76f78593
diff --git a/src/EntityManager.cpp b/src/EntityManager.cpp
index e122fd3..78a3ca7 100644
--- a/src/EntityManager.cpp
+++ b/src/EntityManager.cpp
@@ -873,41 +873,41 @@
}
timer.expires_after(std::chrono::seconds(10));
- timer.async_wait([&systemConfiguration](
- const boost::system::error_code& ec) {
- if (ec == boost::asio::error::operation_aborted)
- {
- // we were cancelled
- return;
- }
-
- bool powerOff = !isPowerOn();
- for (const auto& item : lastJson.items())
- {
- if (systemConfiguration.find(item.key()) ==
- systemConfiguration.end())
+ timer.async_wait(
+ [&systemConfiguration](const boost::system::error_code& ec) {
+ if (ec == boost::asio::error::operation_aborted)
{
- bool isDetectedPowerOn = deviceRequiresPowerOn(item.value());
- if (powerOff && isDetectedPowerOn)
- {
- // power not on yet, don't know if it's there or not
- continue;
- }
- if (!powerOff && scannedPowerOff && isDetectedPowerOn)
- {
- // already logged it when power was off
- continue;
- }
-
- logDeviceRemoved(item.value());
+ // we were cancelled
+ return;
}
- }
- scannedPowerOff = true;
- if (!powerOff)
- {
- scannedPowerOn = true;
- }
- });
+
+ bool powerOff = !isPowerOn();
+ for (const auto& item : lastJson.items())
+ {
+ if (systemConfiguration.find(item.key()) ==
+ systemConfiguration.end())
+ {
+ bool requirePowerOn = deviceRequiresPowerOn(item.value());
+ if (powerOff && requirePowerOn)
+ {
+ // power not on yet, don't know if it's there or not
+ continue;
+ }
+ if (!powerOff && scannedPowerOff && requirePowerOn)
+ {
+ // already logged it when power was off
+ continue;
+ }
+
+ logDeviceRemoved(item.value());
+ }
+ }
+ scannedPowerOff = true;
+ if (!powerOff)
+ {
+ scannedPowerOn = true;
+ }
+ });
}
// main properties changed entry