Merge pull request #255 from vizzuhq/logging

Unifying logs

Author: simzer

src/apps/weblib/interface.cpp

@@ -16,8 +16,9 @@ Interface Interface::instance;
 
 Interface::Interface() : versionStr(std::string(Main::version))
 {
+	IO::Log::setEnabled(false);
+	IO::Log::setTimestamp(false);
 	needsUpdate = false;
-	logging = false;
 	eventParam = nullptr;
 }
 
@@ -305,12 +306,6 @@ const char *Interface::dataMetaInfo()
 
 void Interface::init()
 {
-	IO::Log::set(
-	    [=, this](const std::string &msg)
-	    {
-		    if (logging) log((msg + "\n").c_str());
-	    });
-
 	taskQueue = std::make_shared<GUI::TaskQueue>();
 	auto&& chartWidget = std::make_shared<UI::ChartWidget>(taskQueue);
 	chart = {chartWidget, std::addressof(chartWidget->getChart())};
@@ -331,6 +326,11 @@ void Interface::init()
 	needsUpdate = true;
 }
 
+void Interface::setLogging(bool enable)
+{
+	IO::Log::setEnabled(enable);
+}
+
 void Interface::poll()
 {
 	if (taskQueue) taskQueue->poll();
@@ -424,5 +424,3 @@ void Interface::keyPress(int key, bool ctrl, bool alt, bool shift)
 	else
 		throw std::logic_error("No chart exists");
 }
-
-void Interface::log(const char *str) { jsconsolelog(str); }

src/apps/weblib/interface.h

@@ -20,7 +20,7 @@ class Interface
 	Interface();
 	const char *version() const;
 	void init();
-	void setLogging(bool enable) { logging = enable; }
+	void setLogging(bool enable);
 	void keyPress(int key, bool ctrl, bool alt, bool shift);
 	void pointerMove(int pointerId, double x, double y);
 	void pointerDown(int pointerId, double x, double y);
@@ -94,8 +94,6 @@ class Interface
 	ObjectRegistry objects;
 	Util::EventDispatcher::Params *eventParam;
 	bool needsUpdate;
-	bool logging;
-	void log(const char *str);
 };
 
 }

src/apps/weblib/interface.js

@@ -1,7 +1,4 @@
 mergeInto(LibraryManager.library, {
-	jsconsolelog: function(str) {
-		console.log(new Date().toISOString() + ': ' + UTF8ToString(str));
-	},
 	openUrl: function(url) {
 		window.open(UTF8ToString(url), '_blank');
 	},

src/apps/weblib/interfacejs.h

@@ -2,7 +2,6 @@
 #define INTERFACEJS_H
 
 extern "C" {
-extern void jsconsolelog(const char *);
 extern void openUrl(const char *);
 extern void setCursor(const char *cursor);
 extern void event_invoked(int, const char *);

src/base/io/log.cpp

@@ -1,12 +1,41 @@
 #include "log.h"
 
+#include <ctime>
+
 using namespace IO;
 
-Log::LogFunc Log::logFunc;
+namespace
+{
+static bool enabled = true;
+static bool timestamp = true;
+static Log::LogFunc logFunc = [](std::string const &s)
+{
+	puts(s.c_str());
+};
+
+}
+
+LogRecord::LogRecord() : content("[vizzu] ")
+{
+	if (timestamp) {
+		content += "[YYYY-mm-ddTHH:MM:SSZ] ";
+		std::time_t now;
+		std::time(&now);
+		std::strftime(content.data() + 9,
+		    21,
+		    "%Y-%m-%dT%H:%M:%SZ",
+		    std::gmtime(&now));
+		content[9 + 20] = ']';
+	}
+}
 
 void Log::set(Log::LogFunc f) { logFunc = std::move(f); }
 
-Log::Log(const std::string &msg)
+void Log::setEnabled(bool value) { enabled = value; }
+
+void Log::setTimestamp(bool value) { timestamp = value; }
+
+void Log::print(const std::string &msg)
 {
 	if (logFunc) logFunc(msg);
 }

src/base/io/log.h

@@ -15,20 +15,22 @@ class Log
 {
 public:
 	typedef std::function<void(const std::string &)> LogFunc;
-
 	static void set(LogFunc f);
-	Log(const std::string &msg);
+	static void setEnabled(bool);
+	static void setTimestamp(bool);
 
 private:
-	static LogFunc logFunc;
+	static void print(const std::string &msg);
+	Log() = default;
+	~Log() = default;
+
+	friend class LogRecord;
 };
 
 class LogRecord
 {
 public:
-	LogRecord() = default;
-	LogRecord(LogRecord &&) = default;
-	~LogRecord() { Log{content}; }
+	~LogRecord() { Log::print(content); }
 
 	template <typename T> LogRecord &operator<<(const T &value)
 	{
@@ -37,6 +39,11 @@ class LogRecord
 	}
 
 private:
+	friend LogRecord log();
+
+	LogRecord();
+	LogRecord(LogRecord &&) = default;
+
 	std::string content;
 };