Improved log record.

Klaim · Klaim · commit 98a3100aa085 · 2012-11-15T13:12:32.000+01:00
- log record informations are now separated
- the log handler decide how to format the log record
- log record accepts more than compatible-to-string types on
construction,
anything string-streamable will work (need additional tests though)
diff --git a/include/network/detail/debug.hpp b/include/network/detail/debug.hpp
@@ -22,7 +22,7 @@
 
 #  include <network/logging/logging.hpp>
 #  ifndef NETWORK_MESSAGE
-#  define NETWORK_MESSAGE(msg) network::logging::log_record() << "[network " << __FILE__ << ':' << __LINE__ << "]: " << msg;
+#  define NETWORK_MESSAGE(msg) network::logging::log_record( __FILE__, __LINE__ ) << msg;
 #  endif
 
 #else
diff --git a/include/network/logging/logging.hpp b/include/network/logging/logging.hpp
@@ -31,10 +31,20 @@ class log_record
 public:
   log_record(){} // = default;
 
-  // Implicit construction from string
-  log_record( const std::string& message ) 
+  // Implicit construction from anything serializable to text.
+  template< typename TypeOfSomething >
+  log_record( TypeOfSomething&& message ) 
+	  : m_filename( "unknown" )
+	  , m_line(0)
+  {
+    write( std::forward<TypeOfSomething>(message) );
+  }
+
+  // Construction with recording context informations.
+  log_record( std::string filename, unsigned long line )
+	  : m_filename( filename )
+	  , m_line( line )
   {
-    write( message );
   }
 
   ~log_record()
@@ -49,15 +59,18 @@ class log_record
     return *this;
   }
 
-  std::string full_message() const { return m_text_stream.str(); }
+  std::string message() const { return m_text_stream.str(); }
+  const std::string& filename() const { return m_filename; }
+  unsigned long line() const { return m_line; }
 
 private:
   // disable copy
   log_record( const log_record& ); // = delete;
   log_record& operator=( const log_record& ); // = delete;
 
   std::ostringstream m_text_stream; // stream in which we build the message
-    
+  std::string m_filename; // = "unknown";
+  unsigned long m_line; // = 0;
 };
   
 template< typename TypeOfSomething >
diff --git a/libs/network/src/logging/logging.cpp b/libs/network/src/logging/logging.cpp
@@ -18,8 +18,9 @@ namespace handler
   namespace
   {
     void std_log_handler( const log_record& log )
-    {
-      std::cerr << log.full_message() << std::endl;
+	{
+      std::cerr << "[network " << log.filename() << ":" << log.line() << "] " 
+	            << log.message() << std::endl;
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,9 @@ namespace handler`
`18`	`18`	`namespace`
`19`	`19`	`{`
`20`	`20`	`void std_log_handler( const log_record& log )`
`21`		`- {`
`22`		`- std::cerr << log.full_message() << std::endl;`
	`21`	`+ {`
	`22`	`+ std::cerr << "[network " << log.filename() << ":" << log.line() << "] "`
	`23`	`+ << log.message() << std::endl;`
`23`	`24`	`}`
`24`	`25`	`}`
`25`	`26`