Move node() == nullptr check into //aos:configuration
This simplifies the code surprisingly significantly for dealing with
single node systems.
Change-Id: Ib317e16a9055fbf1341a194120a5b34f05b2d8f8
diff --git a/aos/events/event_loop.h b/aos/events/event_loop.h
index 4ac6e6d..ea2bf6e 100644
--- a/aos/events/event_loop.h
+++ b/aos/events/event_loop.h
@@ -370,14 +370,11 @@
<< ": Channel { \"name\": \"" << channel_name << "\", \"type\": \""
<< T::GetFullyQualifiedName() << "\" } not found in config.";
- if (node() != nullptr) {
- if (!configuration::ChannelIsReadableOnNode(channel, node())) {
- LOG(FATAL)
- << "Channel { \"name\": \"" << channel_name << "\", \"type\": \""
- << T::GetFullyQualifiedName()
- << "\" } is not able to be fetched on this node. Check your "
- "configuration.";
- }
+ if (!configuration::ChannelIsReadableOnNode(channel, node())) {
+ LOG(FATAL) << "Channel { \"name\": \"" << channel_name
+ << "\", \"type\": \"" << T::GetFullyQualifiedName()
+ << "\" } is not able to be fetched on this node. Check your "
+ "configuration.";
}
return Fetcher<T>(MakeRawFetcher(channel));
@@ -394,13 +391,11 @@
<< ": Channel { \"name\": \"" << channel_name << "\", \"type\": \""
<< T::GetFullyQualifiedName() << "\" } not found in config.";
- if (node() != nullptr) {
- if (!configuration::ChannelIsSendableOnNode(channel, node())) {
- LOG(FATAL) << "Channel { \"name\": \"" << channel_name
- << "\", \"type\": \"" << T::GetFullyQualifiedName()
- << "\" } is not able to be sent on this node. Check your "
- "configuration.";
- }
+ if (!configuration::ChannelIsSendableOnNode(channel, node())) {
+ LOG(FATAL) << "Channel { \"name\": \"" << channel_name
+ << "\", \"type\": \"" << T::GetFullyQualifiedName()
+ << "\" } is not able to be sent on this node. Check your "
+ "configuration.";
}
return Sender<T>(MakeRawSender(channel));