Changeset 2467 for source/ariba

Timestamp:

Feb 19, 2009, 4:45:14 PM (16 years ago)

Author:

Christoph Mayer

Message:

-logging farben über ./configure --enable-logcolors=yes einschaltbar, sonst per default ausgeschalten
-alls std::cout auskommentiert

Location:

source/ariba

Files:

• AribaModule.cpp (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• communication/modules/transport/protlib/logfile.cpp (modified) (2 diffs)
• communication/modules/transport/protlib/logfile.h (modified) (3 diffs)
• communication/modules/transport/tcp/TCPTransport.cpp (modified) (1 diff)
• communication/modules/transport/tcp/TCPTransport.h (modified) (1 diff)
• utility/logging/Logging.h (modified) (2 diffs)
• utility/messages/MessageReceiver.cpp (modified) (1 diff)
• utility/system/Timer.cpp (modified) (1 diff)

source/ariba/AribaModule.cpp

@@ -132 +132 @@
         }
 
-        std::cout << "added bootstrap info: " << getBootstrapHints() << std::endl;
+        //std::cout << "added bootstrap info: " << getBootstrapHints() << std::endl;
 }
 

source/ariba/Makefile.am

@@ -35 +35 @@
 if OMNET
 AM_CPPFLAGS    += -fPIC -DUNDERLAY_OMNET
+endif
+
+if LOGCOLORS
+AM_CPPFLAGS    += -DLOGCOLORS
 endif
 

source/ariba/communication/modules/transport/protlib/logfile.cpp

@@ -119 +119 @@
   if (logstream && !quiet)
   {
-    (*logstream) << color[blue] << timenow() << '[' << getpid() << "] Redirecting Log output to \"" << filename << '\"' << endl;
-    (*logstream) << color[blue] << timenow() 
-                 << '[' << getpid() << "] <<<<<<<<<<<<<<<<<<<<<<<< *** LOG  STOP *** <<<<<<<<<<<<<<<<<<<<<<<<" 
-                 << color[off] << endl;
+//     (*logstream) << color[blue] << timenow() << '[' << getpid() << "] Redirecting Log output to \"" << filename << '\"' << endl;
+//     (*logstream) << color[blue] << timenow() 
+//               << '[' << getpid() << "] <<<<<<<<<<<<<<<<<<<<<<<< *** LOG  STOP *** <<<<<<<<<<<<<<<<<<<<<<<<" 
+//               << color[off] << endl;
   }
 
@@ -144 +144 @@
   else
   {
-    (*logstream) << color[blue] << timenow() 
-                 << '[' << getpid() << "] >>>>>>>>>>>>>>>>>>>>>>>> *** LOG START *** >>>>>>>>>>>>>>>>>>>>>>>>" 
-                 << color[off] << endl;
+//     (*logstream) << color[blue] << timenow() 
+//               << '[' << getpid() << "] >>>>>>>>>>>>>>>>>>>>>>>> *** LOG START *** >>>>>>>>>>>>>>>>>>>>>>>>" 
+//               << color[off] << endl;
   }
   return true;

source/ariba/communication/modules/transport/protlib/logfile.h

@@ -31 +31 @@
 
 
-//#define _NO_LOGGING
+#define _NO_LOGGING
 
 #include <fstream> // file stream
@@ -243 +243 @@
     if (!quiet_start && logstream)
     {
-      (*logstream) << color[blue] << timenow()
-                   << '[' << getpid() << "] >>>>>>>>>>>>>>>>>>>>>>>> *** LOG START *** >>>>>>>>>>>>>>>>>>>>>>>>"
-                   << color[off] << endl;
+//       (*logstream) << color[blue] << timenow()
+//                 << '[' << getpid() << "] >>>>>>>>>>>>>>>>>>>>>>>> *** LOG START *** >>>>>>>>>>>>>>>>>>>>>>>>"
+//                 << color[off] << endl;
     }
     pthread_mutex_unlock(&logmutex);
@@ -260 +260 @@
 
     if ( ! quiet_start )
-        (*logstream) << color[blue] << timenow() << '[' << getpid()
-        << "] <<<<<<<<<<<<<<<<<<<<<<<< *** LOG  STOP *** <<<<<<<<<<<<<<<<<<<<<<<<"
-        << color[off] << endl;
+//      (*logstream) << color[blue] << timenow() << '[' << getpid()
+//      << "] <<<<<<<<<<<<<<<<<<<<<<<< *** LOG  STOP *** <<<<<<<<<<<<<<<<<<<<<<<<"
+//      << color[off] << endl;
     pthread_mutex_unlock(&logmutex);
 

source/ariba/communication/modules/transport/tcp/TCPTransport.cpp

@@ -314 +314 @@
 
                 // send message
-                cout << "Sending message ..." << endl;
+                //cout << "Sending message ..." << endl;
                 sendMessage( new TextMessage( "Hello World!" ) );
-                cout << "Message sent ..." << endl;
+                //cout << "Message sent ..." << endl;
 
         }

source/ariba/communication/modules/transport/tcp/TCPTransport.h

@@ -41 +41 @@
 
 // kill protlib logging
-//#define _NO_LOGGING
+#define _NO_LOGGING
 
 #include "ariba/utility/logging/Logging.h"

source/ariba/utility/logging/Logging.h

@@ -45 +45 @@
 #include <log4cxx/basicconfigurator.h>
 
-#define colorDefault { std::cout << "\033[0m";  } /*reset*/
-#define colorDebug   { std::cout << "\033[31m"; } /*gray*/
-#define colorInfo    { std::cout << "\033[32m"; } /*green*/
-#define colorWarn    { std::cout << "\033[34m"; } /*blue*/
-#define colorError   { std::cout << "\033[31m"; } /*red*/
+#ifdef LOGCOLORS
+
+  #define colorDefault { std::cout << "\033[0m";  } /*reset*/
+  #define colorDebug   { std::cout << "\033[33m"; } /*cyan*/
+  #define colorInfo    { std::cout << "\033[32m"; } /*green*/
+  #define colorWarn    { std::cout << "\033[34m"; } /*blue*/
+  #define colorError   { std::cout << "\033[31m"; } /*red*/
+
+#else
+
+  #define colorDefault { }
+  #define colorDebug   { }
+  #define colorInfo    { }
+  #define colorWarn    { }
+  #define colorError   { }
+
+#endif // ENABLE_LOGCOLORS
 
 #define use_logging_h(x) \
@@ -57 +69 @@
         log4cxx::LoggerPtr x::logger(log4cxx::Logger::getLogger(#x));
 
-#define logging_trace(x)  {            LOG4CXX_TRACE(logger,x);              }
-#define logging_debug(x)  {colorDebug; LOG4CXX_DEBUG(logger,x); colorDefault;}
-#define logging_info(x)   {colorInfo;  LOG4CXX_INFO(logger,x);  colorDefault;}
-#define logging_warn(x)   {colorWarn;  LOG4CXX_WARN(logger,x);  colorDefault;}
-#define logging_error(x)  {colorError; LOG4CXX_ERROR(logger,x); colorDefault;}
-#define logging_fatal(x)  {colorError; LOG4CXX_FATAL(logger,x); exit(-1);    }
+#define logging_trace(x)  {            LOG4CXX_TRACE(logger,x);                         }
+#define logging_debug(x)  {colorDebug; LOG4CXX_DEBUG(logger,x); colorDefault;           }
+#define logging_info(x)   {colorInfo;  LOG4CXX_INFO(logger,x);  colorDefault;           }
+#define logging_warn(x)   {colorWarn;  LOG4CXX_WARN(logger,x);  colorDefault;           }
+#define logging_error(x)  {colorError; LOG4CXX_ERROR(logger,x); colorDefault;           }
+#define logging_fatal(x)  {colorError; LOG4CXX_FATAL(logger,x); colorDefault; exit(-1); }
 
 #endif //LOGGING_H__

source/ariba/utility/messages/MessageReceiver.cpp

@@ -50 +50 @@
 
 bool MessageReceiver::receiveMessage( const Message* message, const LinkID& link, const NodeID& node ) {
-        std::cout << "UNIMPLEMENTED MessageReceiver got Message:" << (Message*)message << std::endl;
+        //std::cout << "UNIMPLEMENTED MessageReceiver got Message:" << (Message*)message << std::endl;
         return false;
 }

source/ariba/utility/system/Timer.cpp

@@ -89 +89 @@
 
 void Timer::eventFunction() {
-        std::cout << "Timer(" << millis << ")" << std::endl;
+        //std::cout << "unimplemented eventFunction Timer(" << millis << ")" << std::endl;
 }