From 92f08948d3cfbd21aabb57ee61e29e92f1609fa6 Mon Sep 17 00:00:00 2001
From: Murat Dogan <doganmurat@gmail.com>
Date: Wed, 18 Dec 2019 10:33:35 +0300
Subject: [PATCH] Integrate plog

---
 .gitmodules                   | 3 +++
 CMakeLists.txt                | 5 ++++-
 deps/plog                     | 1 +
 include/rtc/configuration.hpp | 4 ++++
 include/rtc/include.hpp       | 1 +
 src/configuration.cpp         | 7 +++++++
 test/main.cpp                 | 5 ++++-
 7 files changed, 24 insertions(+), 2 deletions(-)
 create mode 160000 deps/plog

diff --git a/.gitmodules b/.gitmodules
index db8f68c..f50b4c4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "usrsctp"]
 	path = deps/usrsctp
 	url = https://github.com/sctplab/usrsctp.git
+[submodule "deps/plog"]
+	path = deps/plog
+	url = https://github.com/SergiusTheBest/plog
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ea68cc..93d79e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ project (libdatachannel
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
 
-set(LIBDATACHANNEL_SOURCES
+set(LIBDATACHANNEL_SOURCES	
 	${CMAKE_CURRENT_SOURCE_DIR}/src/candidate.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/certificate.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/channel.cpp
@@ -62,6 +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_link_libraries(datachannel usrsctp-static LibNice::LibNice)
 
 add_library(datachannel-static STATIC EXCLUDE_FROM_ALL ${LIBDATACHANNEL_SOURCES})
@@ -72,6 +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_link_libraries(datachannel-static usrsctp-static LibNice::LibNice)
 
 if (USE_GNUTLS)
@@ -104,5 +106,6 @@ 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)
 
diff --git a/deps/plog b/deps/plog
new file mode 160000
index 0000000..2931644
--- /dev/null
+++ b/deps/plog
@@ -0,0 +1 @@
+Subproject commit 293164468998b2ff8d4d13684c065f736ec68fb4
diff --git a/include/rtc/configuration.hpp b/include/rtc/configuration.hpp
index b4ef7b0..ae734cc 100644
--- a/include/rtc/configuration.hpp
+++ b/include/rtc/configuration.hpp
@@ -47,6 +47,10 @@ 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;
diff --git a/include/rtc/include.hpp b/include/rtc/include.hpp
index 3bb7dd9..a599009 100644
--- a/include/rtc/include.hpp
+++ b/include/rtc/include.hpp
@@ -26,6 +26,7 @@
 #include <optional>
 #include <string>
 #include <vector>
+#include <plog/Log.h>
 
 namespace rtc {
 
diff --git a/src/configuration.cpp b/src/configuration.cpp
index c336d56..9e9480c 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "configuration.hpp"
+#include <plog/Appenders/ColorConsoleAppender.h>
 
 namespace rtc {
 
@@ -43,4 +44,10 @@ 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
diff --git a/test/main.cpp b/test/main.cpp
index a118162..4291b86 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -29,12 +29,15 @@ 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)
 	rtc::Configuration config;
+
 	// config.iceServers.emplace_back("stun.l.google.com:19302");
 	// config.enableIceTcp = true;
 
 	// Add TURN Server Example
-	// IceServer turnServer("TURN_SERVER_URL", "PORT_NO", "USERNAME", "PASSWORD", 
+	// IceServer turnServer("TURN_SERVER_URL", "PORT_NO", "USERNAME", "PASSWORD",
 	//							IceServer::RelayType::TurnTls);
 	// config.iceServers.push_back(turnServer);