Merge branch 'default_logging_level' into 'development'

added logging struct to mqtt connect function. added a LogSettings struct which allows the user to set the log level and mask in the mqtt connect. See merge request !19

Merge branch 'default_logging_level' into 'development'
added logging struct to mqtt connect function. added a LogSettings struct which allows the user to set the log level and mask in the mqtt connect. See merge request !19
Peter M. Groen
2 parents 7702feec 1a77e1b5
Showing 5 changed files with 28 additions and 11 deletions
examples/pub/publisher.cpp
include/imqttclient.h
include/log.h
include/mqttclient.h
src/mqttclient.cpp
@@ -31,10 +31,11 @@ Publisher::Publisher()
 void Publisher::connect(const std::string &hostname, int portnumber, const std::string &username, const std::string &password, const std::string &lwt_topic, const std::string &lwt_message)
 {
-    m_mqtt_client.setLogLevel( osdev::components::log::LogLevel::Info );
-    m_mqtt_client.setMask( osdev::components::log::LogMask::Upto );
+    m_mqtt_client.connect( hostname, portnumber,
+                           osdev::components::mqtt::Credentials( username, password ),
+                           osdev::components::mqtt::mqtt_LWT( lwt_topic, lwt_message ), true,
+                           osdev::components::log::LogSettings{ osdev::components::log::LogLevel::Debug, osdev::components::log::LogMask::None } );
-    m_mqtt_client.connect( hostname, portnumber, osdev::components::mqtt::Credentials( username, password ), osdev::components::mqtt::mqtt_LWT( lwt_topic, lwt_message ) );
     std::cout << "Client state : " << m_mqtt_client.state() << std::endl;
 }
@@ -37,9 +37,10 @@
 // mlogic::mqtt
 #include "connectionstatus.h"
 #include "credentials.h"
+#include "log.h"
 #include "mqttmessage.h"
-#include "token.h"
 #include "mqtt_lwt.h"
+#include "token.h"
 namespace osdev {
 namespace components {
@@ -60,13 +61,16 @@ public:
      * @param port The port to use.
      * @param credentials The credentials to use.
      */
-    virtual void connect(const std::string& host, int port, const Credentials& credentials, const mqtt_LWT &lwt = mqtt_LWT(), bool blocking = false ) = 0;
+    virtual void connect( const std::string& host, int port, const Credentials& credentials,
+                          const mqtt_LWT &lwt = mqtt_LWT(), bool blocking = false,
+                          const log::LogSettings &log_settings = log::LogSettings() ) = 0;
     /**
      * @brief Connect to the endpoint
      * @param endpoint an uri endpoint description.
      */
-    virtual void connect(const std::string& endpoint, const mqtt_LWT &lwt = mqtt_LWT(), bool blocking = false ) = 0;
+    virtual void connect( const std::string& endpoint, const mqtt_LWT &lwt = mqtt_LWT(),
+                          bool blocking = false, const log::LogSettings &log_settings = log::LogSettings() ) = 0;
     /**
      * @brief Disconnect the client from the broker
@@ -105,6 +105,12 @@ enum class LogMask
     None
 };
+struct LogSettings
+{
+    LogLevel level = LogLevel::Info;
+    LogMask mask = LogMask::Upto;
+};
+
 /*! \class Log
     \brief Basic logging mechanism.
 */
@@ -115,12 +115,15 @@ public:
     /**
      * @see IMqttClient
      */
-    virtual void connect( const std::string& host, int port, const Credentials &credentials, const mqtt_LWT &lwt = mqtt_LWT(), bool blocking = false ) override;
+    virtual void connect( const std::string& host, int port, const Credentials &credentials,
+                          const mqtt_LWT &lwt = mqtt_LWT(), bool blocking = false,
+                          const log::LogSettings &log_settings = log::LogSettings() ) override;
     /**
      * @see IMqttClient
      */
-    virtual void connect( const std::string &endpoint, const mqtt_LWT &lwt = mqtt_LWT(), bool blocking = false ) override;
+    virtual void connect( const std::string &endpoint, const mqtt_LWT &lwt = mqtt_LWT(),
+                          bool blocking = false, const log::LogSettings &log_settings = log::LogSettings()  ) override;
     /**
      * @see IMqttClient
@@ -124,7 +124,7 @@ StateEnum MqttClient::state() const
     return m_serverState.state();
 }
-void MqttClient::connect(const std::string& host, int port, const Credentials &credentials, const mqtt_LWT &lwt, bool blocking )
+void MqttClient::connect(const std::string& host, int port, const Credentials &credentials, const mqtt_LWT &lwt, bool blocking, const LogSettings &log_settings )
 {
     osdev::components::mqtt::ParsedUri _endpoint = {
         { "scheme", "tcp" },
@@ -134,11 +134,14 @@ void MqttClient::connect(const std::string&amp; host, int port, const Credentials &amp;c
         { "port", std::to_string(port) }
     };
-    this->connect( UriParser::toString( _endpoint ), lwt, blocking );
+    this->connect( UriParser::toString( _endpoint ), lwt, blocking, log_settings );
 }
-void MqttClient::connect( const std::string &_endpoint, const mqtt_LWT &lwt, bool blocking )
+void MqttClient::connect( const std::string &_endpoint, const mqtt_LWT &lwt, bool blocking, const LogSettings &log_settings )
 {
+    Log::setLogLevel( log_settings.level );
+    Log::setMask( log_settings.mask );
+
     LogInfo( "MqttClient", std::string( m_clientId + " - Request connect" ) );
     OSDEV_COMPONENTS_LOCKGUARD(m_interfaceMutex);