From 7ca1cfab1a3b1731dcda9c10c2e1aba941bdff96 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Thu, 4 Feb 2016 12:36:58 -0500
Subject: [PATCH] use shared_ptr for log's stream

---
 Log.cpp | 12 +++++-------
 Log.h   | 13 +++++++------
 api.cpp |  2 +-
 api.h   |  2 +-
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Log.cpp b/Log.cpp
index 837abac8..d507b7dc 100644
--- a/Log.cpp
+++ b/Log.cpp
@@ -13,7 +13,8 @@ static const char * g_LogLevelStr[eNumLogLevels] =
 
 void LogMsg::Process()
 {
-	auto& output = (log && log->GetLogStream ()) ? *log->GetLogStream () : std::cerr;	
+	auto stream = log ? log->GetLogStream () : nullptr;
+	auto& output = stream ? *stream : std::cout;	
 	if (log)	
 		output << log->GetTimestamp ();
 	else
@@ -45,14 +46,12 @@ void Log::Flush ()
 
 void Log::SetLogFile (const std::string& fullFilePath)
 {
-	auto logFile = new std::ofstream (fullFilePath, std::ofstream::out | std::ofstream::binary | std::ofstream::trunc);
+	auto logFile = std::make_shared<std::ofstream> (fullFilePath, std::ofstream::out | std::ofstream::binary | std::ofstream::trunc);
 	if (logFile->is_open ())
 	{
 		SetLogStream (logFile);
 		LogPrint(eLogInfo, "Log: will send messages to ",  fullFilePath);
 	}	
-	else
-		delete logFile;
 }
 
 void Log::SetLogLevel (const std::string& level)
@@ -65,11 +64,10 @@ void Log::SetLogLevel (const std::string& level)
 		LogPrint(eLogError, "Log: Unknown loglevel: ", level);
 		return;
   }
-  LogPrint(eLogInfo, "Log: min messages level set to ", level);
+  LogPrint(eLogInfo, "Log: min msg level set to ", level);
 }
 
-void Log::SetLogStream (std::ostream * logStream)
+void Log::SetLogStream (std::shared_ptr<std::ostream> logStream)
 {
-	if (m_LogStream) delete m_LogStream;	
 	m_LogStream = logStream;
 }
diff --git a/Log.h b/Log.h
index f941e6a7..ec1dc015 100644
--- a/Log.h
+++ b/Log.h
@@ -7,6 +7,7 @@
 #include <fstream>
 #include <functional>
 #include <chrono>
+#include <memory>
 #include "Queue.h"
 
 enum LogLevel
@@ -34,13 +35,13 @@ class Log: public i2p::util::MsgQueue<LogMsg>
 {
 	public:
 
-		Log (): m_LogStream (nullptr) { SetOnEmpty (std::bind (&Log::Flush, this)); };
-		~Log () { delete m_LogStream; };
+		Log () { SetOnEmpty (std::bind (&Log::Flush, this)); };
+		~Log () {};
 
 		void SetLogFile (const std::string& fullFilePath);
 		void SetLogLevel (const std::string& level);
-		void SetLogStream (std::ostream * logStream);
-		std::ostream * GetLogStream () const { return m_LogStream; };	
+		void SetLogStream (std::shared_ptr<std::ostream> logStream);
+		std::shared_ptr<std::ostream> GetLogStream () const { return m_LogStream; };	
 		const std::string& GetTimestamp ();
 		LogLevel GetLogLevel () { return m_MinLevel; };
 
@@ -50,7 +51,7 @@ class Log: public i2p::util::MsgQueue<LogMsg>
 
 	private:
 		
-		std::ostream * m_LogStream;
+		std::shared_ptr<std::ostream> m_LogStream;
 		enum LogLevel m_MinLevel;
 		std::string m_Timestamp;
 #if (__GNUC__ == 4) && (__GNUC_MINOR__ <= 6) && !defined(__clang__) // gcc 4.6
@@ -73,7 +74,7 @@ inline void StartLog (const std::string& fullFilePath)
 	}	
 }
 
-inline void StartLog (std::ostream * s)
+inline void StartLog (std::shared_ptr<std::ostream> s)
 {
 	if (!g_Log)
 	{	
diff --git a/api.cpp b/api.cpp
index cd527550..0f4e1799 100644
--- a/api.cpp
+++ b/api.cpp
@@ -31,7 +31,7 @@ namespace api
 		i2p::crypto::TerminateCrypto ();
 	}	
 	
-	void StartI2P (std::ostream * logStream)
+	void StartI2P (std::shared_ptr<std::ostream> logStream)
 	{
 		if (logStream)
 			StartLog (logStream);
diff --git a/api.h b/api.h
index 05552249..c010d82f 100644
--- a/api.h
+++ b/api.h
@@ -14,7 +14,7 @@ namespace api
 	// initialization start and stop	
 	void InitI2P (int argc, char* argv[], const char * appName);
 	void TerminateI2P ();
-	void StartI2P (std::ostream * logStream = nullptr);
+	void StartI2P (std::shared_ptr<std::ostream> logStream = nullptr);
 	// write system log to logStream, if not specified to <appName>.log in application's folder
 	void StopI2P ();
 	void RunPeerTest (); // should be called after UPnP