Move Logger to attic -- last bit of OS-specific stuff to get out of core.

2 files changed, 245 insertions, 0 deletions

diff --git a/attic/Logger.cpp b/attic/Logger.cpp
new file mode 100644
index 00000000..b30c837c
--- /dev/null
+++ b/attic/Logger.cpp
@@ -0,0 +1,153 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <time.h>
+
+#include "Constants.hpp"
+#include "Logger.hpp"
+
+namespace ZeroTier {
+
+Logger::Logger(const char *p,const char *prefix,unsigned long maxLogSize) :
+	_path((p) ? p : ""),
+	_prefix((prefix) ? (std::string(prefix) + " ") : ""),
+	_maxLogSize(maxLogSize),
+	_log_m(),
+	_log((FILE *)0)
+{
+	if (_path.length())
+		_log = fopen(_path.c_str(),"a");
+	else _log = stdout;
+}
+
+Logger::~Logger()
+{
+	fflush(_log);
+	if ((_log)&&(_log != stdout)&&(_log != stderr))
+		fclose(_log);
+}
+
+void Logger::log(const char *fmt,...)
+{
+	va_list ap;
+	char tmp[128];
+
+	if (_log) {
+		Mutex::Lock _l(_log_m);
+		_rotateIfNeeded();
+
+		if (_log) {
+			time_t now = time(0);
+#ifdef __WINDOWS__
+			ctime_s(tmp,sizeof(tmp),&now);
+			char *nowstr = tmp;
+#else
+			char *nowstr = ctime_r(&now,tmp);
+#endif
+			for(char *c=nowstr;*c;++c) {
+				if (*c == '\n')
+					*c = '\0';
+			}
+
+			if (_prefix.length())
+				fwrite(_prefix.data(),1,_prefix.length(),_log);
+
+			fprintf(_log,"[%s] ",nowstr);
+			va_start(ap,fmt);
+			vfprintf(_log,fmt,ap);
+			va_end(ap);
+#ifdef _WIN32
+			fwrite("\r\n",1,2,_log);
+#else
+			fwrite("\n",1,1,_log);
+#endif
+
+			fflush(_log);
+		}
+	}
+}
+
+#ifdef ZT_TRACE
+void Logger::trace(const char *module,unsigned int line,const char *fmt,...)
+{
+	va_list ap;
+	char tmp[128];
+
+	if (_log) {
+		Mutex::Lock _l(_log_m);
+		_rotateIfNeeded();
+
+		if (_log) {
+			time_t now = time(0);
+#ifdef __WINDOWS__
+			ctime_s(tmp,sizeof(tmp),&now);
+			char *nowstr = tmp;
+#else
+			char *nowstr = ctime_r(&now,tmp);
+#endif
+			for(char *c=nowstr;*c;++c) {
+				if (*c == '\n')
+					*c = '\0';
+			}
+
+			if (_prefix.length())
+				fwrite(_prefix.data(),1,_prefix.length(),_log);
+
+			fprintf(_log,"[%s] TRACE/%s:%u ",nowstr,module,line);
+			va_start(ap,fmt);
+			vfprintf(_log,fmt,ap);
+			va_end(ap);
+#ifdef _WIN32
+			fwrite("\r\n",1,2,_log);
+#else
+			fwrite("\n",1,1,_log);
+#endif
+
+			fflush(_log);
+		}
+	}
+}
+#endif
+
+void Logger::_rotateIfNeeded()
+{
+	if ((_maxLogSize)&&(_log != stdout)&&(_log != stderr)) {
+		long pos = ftell(_log);
+		if (pos > (long)_maxLogSize) {
+			fclose(_log);
+			rename(_path.c_str(),std::string(_path).append(".old").c_str());
+			_log = fopen(_path.c_str(),"w");
+		}
+	}
+}
+
+} // namespace ZeroTier
+
diff --git a/attic/Logger.hpp b/attic/Logger.hpp
new file mode 100644
index 00000000..01be0563
--- /dev/null
+++ b/attic/Logger.hpp
@@ -0,0 +1,92 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#ifndef ZT_LOGGER_HPP
+#define ZT_LOGGER_HPP
+
+#include <stdio.h>
+
+#include <string>
+#include <stdexcept>
+
+#include "NonCopyable.hpp"
+#include "Mutex.hpp"
+
+#undef LOG
+#define LOG(f,...) if (RR->log) RR->log->log(f,##__VA_ARGS__)
+
+#undef TRACE
+#ifdef ZT_TRACE
+#define TRACE(f,...) if (RR->log) RR->log->trace(__FILE__,__LINE__,f,##__VA_ARGS__)
+#else
+#define TRACE(f,...) {}
+#endif
+
+namespace ZeroTier {
+
+/**
+ * Utility for outputting logs to a file or stdout/stderr
+ */
+class Logger : NonCopyable
+{
+public:
+	/**
+	 * Construct a logger to log to a file or stdout
+	 * 
+	 * If a path is supplied to log to a file, maxLogSize indicates the size
+	 * at which this file is closed, renamed to .old, and then a new log is
+	 * opened (essentially a log rotation). If stdout is used, this is ignored.
+	 *
+	 * @param p Path to log to or NULL to use stdout
+	 * @param prefix Prefix to prepend to log lines or NULL for none
+	 * @param maxLogSize Maximum log size (0 for no limit)
+	 */
+	Logger(const char *p,const char *prefix,unsigned long maxLogSize);
+	~Logger();
+
+	void log(const char *fmt,...);
+
+#ifdef ZT_TRACE
+	void trace(const char *module,unsigned int line,const char *fmt,...);
+#else
+	inline void trace(const char *module,unsigned int line,const char *fmt,...) {}
+#endif
+
+private:
+	void _rotateIfNeeded();
+
+	std::string _path;
+	std::string _prefix;
+	unsigned long _maxLogSize;
+	Mutex _log_m;
+	FILE *_log;
+};
+
+} // namespace ZeroTier
+
+#endif
+