log_record now don't log on destruction, logging macro will.

Klaim · Klaim · commit d880bd0f0d5b · 2012-11-21T15:30:21.000+01:00
diff --git a/include/network/detail/debug.hpp b/include/network/detail/debug.hpp
@@ -23,7 +23,7 @@
 
 #  include <network/logging/logging.hpp>
 #  ifndef NETWORK_MESSAGE
-#  define NETWORK_MESSAGE(msg) network::logging::log_record( __FILE__, __LINE__ ) << msg;
+#  define NETWORK_MESSAGE(msg) { network::logging::log( network::logging::log_record( __FILE__, __LINE__ ) << msg ); }
 #  endif
 
 #else
diff --git a/include/network/logging/logging.hpp b/include/network/logging/logging.hpp
@@ -51,12 +51,7 @@ class log_record
       , m_line( line )
   {
   }
-
-  ~log_record()
-  { 
-    log( *this );
-  }
-  
+    
   template< typename TypeOfSomething >
   log_record& write( TypeOfSomething&& something )
   {
diff --git a/libs/network/test/logging/logging_custom_handler.cpp b/libs/network/test/logging/logging_custom_handler.cpp
@@ -28,7 +28,7 @@ BOOST_AUTO_TEST_CASE(custom_log_handler_output) {
   const auto message = "At line " + std::to_string(line_num) + " we check the code.";
 
   set_log_record_handler( custom_log_handler );
-  log_record( file_name, line_num ) << "At line " << line_num << " we check the code.";
+  log( log_record( file_name, line_num ) << "At line " << line_num << " we check the code." );
 
   const auto result_output = log_output.str();
 
diff --git a/libs/network/test/logging/logging_log_record.cpp b/libs/network/test/logging/logging_log_record.cpp
@@ -10,6 +10,8 @@
 #include <boost/test/unit_test.hpp>
 
 #include <network/logging/logging.hpp>
+#define NETWORK_ENABLE_LOGGING
+#include <network/detail/debug.hpp>
 
 using namespace network::logging;
 
@@ -68,4 +70,9 @@ BOOST_AUTO_TEST_CASE(text_stream) {
 
 BOOST_AUTO_TEST_CASE(raw_log) {
   log( "This is a raw log." );
+}
+
+BOOST_AUTO_TEST_CASE(macro_log) {
+  NETWORK_MESSAGE( "This is a log through the macro." );
+  NETWORK_MESSAGE( "This is a log through the macro, with a stream! Num=" << 42  << " - OK!" );
 }

Original file line number	Diff line number	Diff line change
`@@ -51,12 +51,7 @@ class log_record`
`51`	`51`	`, m_line( line )`
`52`	`52`	`{`
`53`	`53`	`}`
`54`		`-`
`55`		`- ~log_record()`
`56`		`- {`
`57`		`- log( *this );`
`58`		`- }`
`59`		`-`
	`54`	`+`
`60`	`55`	`template< typename TypeOfSomething >`
`61`	`56`	`log_record& write( TypeOfSomething&& something )`
`62`	`57`	`{`