[Logging] Introducing Provider/Receiver pattern for logging #1831
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -60,7 +60,7 @@ namespace eCAL | |
| settings_.ClearHostFilter(); // There is no global host filter | ||
|
|
||
| // Initialize eCAL | ||
| eCAL::Initialize("eCALRec-Server", eCAL::Init::Default | eCAL::Init::Monitoring); | ||
|
There was a problem hiding this comment. warning: no header providing "eCAL::Init::Monitoring" is directly included [misc-include-cleaner] eCAL::Initialize("eCALRec-Server", eCAL::Init::Default | eCAL::Init::Monitoring);
^There was a problem hiding this comment. warning: no header providing "eCAL::Initialize" is directly included [misc-include-cleaner] app/rec/rec_server_core/src/rec_server_impl.cpp:21: - #include "recorder_settings.h"
+ #include "ecal/ecal_core.h"
+ #include "recorder_settings.h" |
||
|
|
||
| // Start FTP Server | ||
| ftp_server_->start(5); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -41,42 +41,49 @@ namespace eCAL | |||||
| { | ||||||
| namespace Sinks | ||||||
| { | ||||||
| struct Sink | ||||||
| { | ||||||
| bool enable; //!< Enable sink | ||||||
| eCAL_Logging_Filter filter_log; //!< Log messages logged (all, info, warning, error, fatal, debug1, debug2, debug3, debug4) | ||||||
| }; | ||||||
|
|
||||||
| namespace File | ||||||
| { | ||||||
| struct Configuration | ||||||
| { | ||||||
| std::string path { "" }; //!< Path to log file (Default: "") | ||||||
|
There was a problem hiding this comment. warning: redundant string initialization [readability-redundant-string-init]
Suggested change
|
||||||
| }; | ||||||
| } | ||||||
|
|
||||||
| namespace UDP | ||||||
| { | ||||||
| struct ReceiverConfiguration | ||||||
| { | ||||||
| bool enable { false }; //!< Enable UDP receiver (Default: false) | ||||||
| unsigned int port { 14001 }; //!< UDP port number (Default: 14001) | ||||||
| }; | ||||||
|
|
||||||
| struct ProviderConfiguration | ||||||
| { | ||||||
| unsigned int port { 14001 }; //!< UDP port number (Default: 14001) | ||||||
| }; | ||||||
|
|
||||||
| struct Configuration | ||||||
| { | ||||||
| ReceiverConfiguration receiver; | ||||||
| ProviderConfiguration provider; | ||||||
| }; | ||||||
| } | ||||||
|
|
||||||
| struct Configuration | ||||||
| { | ||||||
| Sink console { true, log_level_error | log_level_fatal}; //!< default: true, log_level_error | ||||||
| Sink file { false, log_level_none }; //!< default: false, log_level_none | ||||||
| Sink udp { true, log_filter_default }; //!< default: true, log_filter_default | ||||||
|
|
||||||
| File::Configuration file_config; | ||||||
| UDP::Configuration udp_config; | ||||||
|
|
||||||
|
There was a problem hiding this comment. Looks very clean like this! |
||||||
| }; | ||||||
| } | ||||||
|
|
||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -576,61 +576,79 @@ namespace YAML | |
| /____/\___/\_, /\_, /_/_//_/\_, / | ||
| /___//___/ /___/ | ||
| */ | ||
|
|
||
| Node convert<eCAL::Logging::Sinks::UDP::ReceiverConfiguration>::encode(const eCAL::Logging::Sinks::UDP::ReceiverConfiguration& config_) | ||
|
There was a problem hiding this comment. warning: no header providing "eCAL::Logging::Sinks::UDP::ReceiverConfiguration" is directly included [misc-include-cleaner] ecal/core/src/config/configuration_to_yaml.cpp:1: + #include "ecal/config/logging.h" |
||
| { | ||
| Node node; | ||
| node["enable"] = config_.enable; | ||
| node["port"] = config_.port; | ||
| return node; | ||
| } | ||
|
|
||
| bool convert<eCAL::Logging::Sinks::UDP::ReceiverConfiguration>::decode(const Node& node_, eCAL::Logging::Sinks::UDP::ReceiverConfiguration& config_) | ||
| { | ||
| AssignValue<bool>(config_.enable, node_, "enable"); | ||
| AssignValue<unsigned int>(config_.port, node_, "port"); | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| Node convert<eCAL::Logging::Sinks::UDP::ProviderConfiguration>::encode(const eCAL::Logging::Sinks::UDP::ProviderConfiguration& config_) | ||
|
There was a problem hiding this comment. warning: no header providing "eCAL::Logging::Sinks::UDP::ProviderConfiguration" is directly included [misc-include-cleaner] Node convert<eCAL::Logging::Sinks::UDP::ProviderConfiguration>::encode(const eCAL::Logging::Sinks::UDP::ProviderConfiguration& config_)
^ |
||
| { | ||
| Node node; | ||
| node["port"] = config_.port; | ||
| return node; | ||
| } | ||
|
|
||
| bool convert<eCAL::Logging::Sinks::UDP::ProviderConfiguration>::decode(const Node& node_, eCAL::Logging::Sinks::UDP::ProviderConfiguration& config_) | ||
| { | ||
| AssignValue<unsigned int>(config_.port, node_, "port"); | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| Node convert<eCAL::Logging::Sinks::UDP::Configuration>::encode(const eCAL::Logging::Sinks::UDP::Configuration& config_) | ||
|
There was a problem hiding this comment. warning: no header providing "eCAL::Logging::Sinks::UDP::Configuration" is directly included [misc-include-cleaner] Node convert<eCAL::Logging::Sinks::UDP::Configuration>::encode(const eCAL::Logging::Sinks::UDP::Configuration& config_)
^ |
||
| { | ||
| Node node; | ||
| node["receiver"] = config_.receiver; | ||
| node["provider"] = config_.provider; | ||
| return node; | ||
| } | ||
|
|
||
| bool convert<eCAL::Logging::Sinks::UDP::Configuration>::decode(const Node& node_, eCAL::Logging::Sinks::UDP::Configuration& config_) | ||
| { | ||
| AssignValue<eCAL::Logging::Sinks::UDP::ProviderConfiguration>(config_.provider, node_, "provider"); | ||
| AssignValue<eCAL::Logging::Sinks::UDP::ReceiverConfiguration>(config_.receiver, node_, "receiver"); | ||
| return true; | ||
| } | ||
|
|
||
| Node convert<eCAL::Logging::Sinks::Sink>::encode(const eCAL::Logging::Sinks::Sink& config_) | ||
|
There was a problem hiding this comment. warning: no header providing "eCAL::Logging::Sinks::Sink" is directly included [misc-include-cleaner] Node convert<eCAL::Logging::Sinks::Sink>::encode(const eCAL::Logging::Sinks::Sink& config_)
^ |
||
| { | ||
| Node node; | ||
| node["enable"] = config_.enable; | ||
| node["level"] = LogLevelToVector(config_.filter_log); | ||
| return node; | ||
| } | ||
|
|
||
| bool convert<eCAL::Logging::Sinks::Sink>::decode(const Node& node_, eCAL::Logging::Sinks::Sink& config_) | ||
| { | ||
| AssignValue<bool>(config_.enable, node_, "enable"); | ||
| std::vector<std::string> tmp; | ||
| AssignValue<std::vector<std::string>>(tmp, node_, "level"); | ||
| config_.filter_log = ParseLogLevel(tmp); | ||
| return true; | ||
| } | ||
|
|
||
| Node convert<eCAL::Logging::Sinks::File::Configuration>::encode(const eCAL::Logging::Sinks::File::Configuration& config_) | ||
| { | ||
| Node node; | ||
| node["path"] = config_.path; | ||
| return node; | ||
| } | ||
|
|
||
| bool convert<eCAL::Logging::Sinks::File::Configuration>::decode(const Node& node_, eCAL::Logging::Sinks::File::Configuration& config_) | ||
| { | ||
| AssignValue<std::string>(config_.path, node_, "path"); | ||
| return true; | ||
| } | ||
|
|
||
|
|
@@ -645,9 +663,11 @@ namespace YAML | |
|
|
||
| bool convert<eCAL::Logging::Sinks::Configuration>::decode(const Node& node_, eCAL::Logging::Sinks::Configuration& config_) | ||
| { | ||
| AssignValue<eCAL::Logging::Sinks::Sink>(config_.console, node_, "console"); | ||
| AssignValue<eCAL::Logging::Sinks::Sink>(config_.file, node_, "file"); | ||
| AssignValue<eCAL::Logging::Sinks::Sink>(config_.udp, node_, "udp"); | ||
| AssignValue<eCAL::Logging::Sinks::UDP::Configuration>(config_.udp_config, node_, "udp"); | ||
| AssignValue<eCAL::Logging::Sinks::File::Configuration>(config_.file_config, node_, "file"); | ||
| return true; | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -298,19 +298,19 @@ namespace YAML | |
| /___//___/ /___/ | ||
| */ | ||
| template<> | ||
| struct convert<eCAL::Logging::Sinks::UDP::ReceiverConfiguration> | ||
|
There was a problem hiding this comment. warning: no header providing "eCAL::Logging::Sinks::UDP::ReceiverConfiguration" is directly included [misc-include-cleaner] ecal/core/src/config/configuration_to_yaml.h:26: - #include <ecal/config/configuration.h>
+ #include "ecal/config/logging.h"
+ #include <ecal/config/configuration.h> |
||
| { | ||
| static Node encode(const eCAL::Logging::Sinks::UDP::ReceiverConfiguration& config_); | ||
|
|
||
| static bool decode(const Node& node_, eCAL::Logging::Sinks::UDP::ReceiverConfiguration& config_); | ||
|
There was a problem hiding this comment. It feels a bit strange that |
||
| }; | ||
|
|
||
| template<> | ||
| struct convert<eCAL::Logging::Sinks::UDP::ProviderConfiguration> | ||
|
There was a problem hiding this comment. warning: no header providing "eCAL::Logging::Sinks::UDP::ProviderConfiguration" is directly included [misc-include-cleaner] struct convert<eCAL::Logging::Sinks::UDP::ProviderConfiguration>
^ |
||
| { | ||
| static Node encode(const eCAL::Logging::Sinks::UDP::ProviderConfiguration& config_); | ||
|
|
||
| static bool decode(const Node& node_, eCAL::Logging::Sinks::UDP::ProviderConfiguration& config_); | ||
| }; | ||
|
|
||
| template<> | ||
|
|
@@ -321,6 +321,22 @@ namespace YAML | |
| static bool decode(const Node& node_, eCAL::Logging::Sinks::File::Configuration& config_); | ||
| }; | ||
|
|
||
| template<> | ||
| struct convert<eCAL::Logging::Sinks::UDP::Configuration> | ||
|
There was a problem hiding this comment. warning: no header providing "eCAL::Logging::Sinks::UDP::Configuration" is directly included [misc-include-cleaner] struct convert<eCAL::Logging::Sinks::UDP::Configuration>
^ |
||
| { | ||
| static Node encode(const eCAL::Logging::Sinks::UDP::Configuration& config_); | ||
|
|
||
| static bool decode(const Node& node_, eCAL::Logging::Sinks::UDP::Configuration& config_); | ||
| }; | ||
|
|
||
| template<> | ||
| struct convert<eCAL::Logging::Sinks::Sink> | ||
|
There was a problem hiding this comment. warning: no header providing "eCAL::Logging::Sinks::Sink" is directly included [misc-include-cleaner] struct convert<eCAL::Logging::Sinks::Sink>
^ |
||
| { | ||
| static Node encode(const eCAL::Logging::Sinks::Sink& config_); | ||
|
|
||
| static bool decode(const Node& node_, eCAL::Logging::Sinks::Sink& config_); | ||
| }; | ||
|
|
||
| template<> | ||
| struct convert<eCAL::Logging::Sinks::Configuration> | ||
| { | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
warning: no header providing "eCAL::Init::Default" is directly included [misc-include-cleaner]
app/rec/rec_server_core/src/rec_server_impl.cpp:21: