Move logger init task to a function

CMakeLists.txt

@@ -62,7 +62,7 @@ set_target_properties(datachannel PROPERTIES
 target_include_directories(datachannel PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
 target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc)
 target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
-target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/deps/plog/include)
+target_include_directories(datachannel PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/deps/plog/include)
 target_link_libraries(datachannel usrsctp-static LibNice::LibNice)
 
 add_library(datachannel-static STATIC EXCLUDE_FROM_ALL ${LIBDATACHANNEL_SOURCES})
@@ -73,7 +73,7 @@ set_target_properties(datachannel-static PROPERTIES
 target_include_directories(datachannel-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
 target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc)
 target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
-target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/deps/plog/include)
+target_include_directories(datachannel-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/deps/plog/include)
 target_link_libraries(datachannel-static usrsctp-static LibNice::LibNice)
 
 if (USE_GNUTLS)
@@ -106,6 +106,5 @@ set_target_properties(tests PROPERTIES
 	VERSION ${PROJECT_VERSION}
 	CXX_STANDARD 17)
 
-target_include_directories(tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/deps/plog/include)
 target_link_libraries(tests datachannel)
 

include/rtc/configuration.hpp

@@ -47,10 +47,6 @@ struct IceServer {
 };
 
 struct Configuration {
-	enum class LogLevel { none, fatal, error, warning, info, debug, verbose };
-
-	Configuration(const LogLevel logLevel_ = LogLevel::error);
-
 	std::vector<IceServer> iceServers;
 	bool enableIceTcp = false;
 	uint16_t portRangeBegin = 1024;

include/rtc/rtc.h

@@ -41,6 +41,9 @@ typedef enum {
 	RTC_GATHERING_COMPLETE = 2
 } rtc_gathering_state_t;
 
+typedef enum { none, fatal, error, warning, info, debug, verbose } LogLevel;
+
+void rtcInitLogger(LogLevel logLevel, plog::IAppender *appender = NULL);
 int rtcCreatePeerConnection(const char **iceServers, int iceServersCount);
 void rtcDeletePeerConnection(int pc);
 int rtcCreateDataChannel(int pc, const char *label);
@@ -52,8 +55,8 @@ void rtcSetLocalCandidateCallback(int pc,
                                   void (*candidateCallback)(const char *, const char *, void *));
 void rtcSetStateChangeCallback(int pc, void (*stateCallback)(rtc_state_t state, void *));
 void rtcSetGatheringStateChangeCallback(int pc,
-                                         void (*gatheringStateCallback)(rtc_gathering_state_t state,
-                                                                        void *));
+                                        void (*gatheringStateCallback)(rtc_gathering_state_t state,
+                                                                       void *));
 void rtcSetRemoteDescription(int pc, const char *sdp, const char *type);
 void rtcAddRemoteCandidate(int pc, const char *candidate, const char *mid);
 int rtcGetDataChannelLabel(int dc, char *data, int size);
@@ -68,4 +71,3 @@ void rtcSetUserPointer(int i, void *ptr);
 #endif
 
 #endif
-

src/configuration.cpp

@@ -17,7 +17,6 @@
  */
 
 #include "configuration.hpp"
-#include <plog/Appenders/ColorConsoleAppender.h>
 
 namespace rtc {
 
@@ -44,10 +43,4 @@ IceServer::IceServer(const string &hostname_, const string &service_, string use
     : hostname(hostname_), service(service_), type(Type::Turn), username(username_),
       password(password_), relayType(relayType_) {}
 
-Configuration::Configuration(const LogLevel logLevel_) {
-	static plog::ColorConsoleAppender<plog::TxtFormatter> consoleAppender;
-	plog::init(static_cast<plog::Severity>(logLevel_), &consoleAppender);
-	LOGD << "Logger Initialized";
-}
-
 } // namespace rtc

src/rtc.cpp

@@ -23,6 +23,8 @@
 
 #include <unordered_map>
 
+#include <plog/Appenders/ColorConsoleAppender.h>
+
 using namespace rtc;
 using std::shared_ptr;
 using std::string;
@@ -41,6 +43,16 @@ void *getUserPointer(int id) {
 
 } // namespace
 
+void rtcInitLogger(LogLevel logLevel, plog::IAppender *appender) {
+	static plog::ColorConsoleAppender<plog::TxtFormatter> consoleAppender;
+
+	if (appender == NULL)
+		plog::init(static_cast<plog::Severity>(logLevel), &consoleAppender);
+	else
+		plog::init(static_cast<plog::Severity>(logLevel), appender);
+	LOGD << "Logger Initialized";
+}
+
 int rtcCreatePeerConnection(const char **iceServers, int iceServersCount) {
 	Configuration config;
 	for (int i = 0; i < iceServersCount; ++i) {
@@ -112,8 +124,8 @@ void rtcSetStateChangeCallback(int pc, void (*stateCallback)(rtc_state_t state,
 }
 
 void rtcSetGatheringStateChangeCallback(int pc,
-                                         void (*gatheringStateCallback)(rtc_gathering_state_t state,
-                                                                        void *)) {
+                                        void (*gatheringStateCallback)(rtc_gathering_state_t state,
+                                                                       void *)) {
 	auto it = peerConnectionMap.find(pc);
 	if (it == peerConnectionMap.end())
 		return;
@@ -209,4 +221,3 @@ void rtcSetUserPointer(int i, void *ptr) {
 	else
 		userPointerMap.erase(i);
 }
-

test/main.cpp

@@ -29,8 +29,7 @@ using namespace std;
 template <class T> weak_ptr<T> make_weak_ptr(shared_ptr<T> ptr) { return ptr; }
 
 int main(int argc, char **argv) {
-	// For debug messages
-	// rtc::Configuration config(Configuration::LogLevel::debug)
+	rtcInitLogger(LogLevel::debug);
 	rtc::Configuration config;
 
 	// config.iceServers.emplace_back("stun.l.google.com:19302");