log: add private attribute to set header of logs only once

Clement Champetier · Clement Champetier · commit b59b05011655 · 2015-10-20T15:40:42.000+02:00
Fix #255
diff --git a/src/AvTranscoder/log.cpp b/src/AvTranscoder/log.cpp
@@ -3,6 +3,8 @@
 namespace avtranscoder
 {
 
+std::string Logger::logHeaderMessage = "";
+
 void callbackToWriteInFile( void *ptr, int level, const char *fmt, va_list vl )
 {
 	std::ofstream outputFile;
@@ -23,13 +25,10 @@ void callbackToWriteInFile( void *ptr, int level, const char *fmt, va_list vl )
 
 void Logger::setLogLevel( const int level )
 {
+	// set ffmpeg log level
 	av_log_set_level( level );
-}
-
-void Logger::log( const int level, const std::string& msg )
-{
-	std::string avTranscoderMsg( "[avTranscoder - " );
 
+	// set avtranscoder header message
 	std::string levelStr;
 	switch( level )
 	{
@@ -48,12 +47,15 @@ void Logger::log( const int level, const std::string& msg )
 		default:
 			break;
 	}
+	Logger::logHeaderMessage = "[avTranscoder - " + levelStr + "] ";
+}
 
-	avTranscoderMsg += levelStr;
-	avTranscoderMsg += "] ";
-	avTranscoderMsg += msg;
-	avTranscoderMsg += "\n";
-	av_log( NULL, level, avTranscoderMsg.c_str() );
+void Logger::log( const int level, const std::string& msg )
+{
+	std::string logMessage = Logger::logHeaderMessage;
+	logMessage += msg;
+	logMessage += "\n";
+	av_log( NULL, level, logMessage.c_str() );
 }
 
 void Logger::logInFile()
diff --git a/src/AvTranscoder/log.hpp b/src/AvTranscoder/log.hpp
@@ -44,6 +44,9 @@ class AvExport Logger
 	 * @note log filename is avtranscoder.log
 	 */
 	static void logInFile();
+
+private:
+	static std::string logHeaderMessage;  ///< First caracters present for each logging message
 };
 
 }

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,9 @@ class AvExport Logger`
`44`	`44`	`* @note log filename is avtranscoder.log`
`45`	`45`	`*/`
`46`	`46`	`static void logInFile();`
	`47`	`+`
	`48`	`+private:`
	`49`	`+ static std::string logHeaderMessage; ///< First caracters present for each logging message`
`47`	`50`	`};`
`48`	`51`
`49`	`52`	`}`