diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-13 17:43:16 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-13 17:43:16 -0400 |
| commit | 8b946999a7e332249236d7317a76fdd8d3387dc7 (patch) | |
| tree | efa53402a38401c9b9c5c2ce5506fb4d585589f8 /gnuradio-core/src/lib/runtime | |
| parent | b8aa54c9ca45ac94faff975196047a6fc23f6245 (diff) | |
log: fixes to replace log4cxx with log4cpp.
Diffstat (limited to 'gnuradio-core/src/lib/runtime')
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_logger.h | 46 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/runtime/qa_gr_logger.cc | 13 |
2 files changed, 29 insertions, 30 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_logger.h b/gnuradio-core/src/lib/runtime/gr_logger.h index 2aadc3c936..13f31d60b8 100644 --- a/gnuradio-core/src/lib/runtime/gr_logger.h +++ b/gnuradio-core/src/lib/runtime/gr_logger.h @@ -70,35 +70,35 @@ typedef std::string gr_logger_ptr; #define GR_GET_LEVEL(name, level) #define GR_LOG_GET_LEVEL(logger, level) #define GR_ADD_CONSOLE_APPENDER(logger,target,pattern) -#define GR_LOG_ADD_CONSOLE_APPENDER(logger,,target,pattern) +#define GR_LOG_ADD_CONSOLE_APPENDER(logger,target,pattern) #define GR_ADD_FILE_APPENDER(name,filename,append,pattern) #define GR_LOG_ADD_FILE_APPENDER(logger,filename,append,pattern) #define GR_ADD_ROLLINGFILE_APPENDER(name,filename,filesize,bkup_index,append,mode,pattern) #define GR_LOG_ADD_ROLLINGFILE_APPENDER(logger,filename,filesize,bkup_index,append,mode,pattern) #define GR_GET_LOGGER_NAMES(names) #define GR_RESET_CONFIGURATION() -#define GR_DEBUG(name, msg) std::cout<<"DEBUG:"<<msg<<std::endl -#define GR_INFO(name, msg) std::cout<<"INFO:"<<msg<<std::endl -#define GR_NOTICE(name, msg) std::cout<<"NOTICE:"<<msg<<std::endl -#define GR_WARN(name, msg) std::cerr<<"WARN:"<<msg<<std::endl -#define GR_ERROR(name, msg) std::cerr<<"ERROR:"<<msg<<std::endl -#define GR_ALERT(name, msg) std::cerr<<"ERROR:"<<msg<<std::endl -#define GR_CRIT(name, msg) std::cerr<<"ERROR:"<<msg<<std::endl -#define GR_FATAL(name, msg) std::cerr<<"FATAL:"<<msg<<std::endl -#define GR_EMERG(name, msg) std::cerr<<"EMERG:"<<msg<<std::endl -#define GR_ERRORIF(name, cond, msg) if((cond)) std::cerr<<"ERROR:"<<msg<<std::endl -#define GR_ASSERT(name, cond, msg) if(!(cond)) std::cerr<<"ERROR:"<<msg<<std::endl; assert(cond) -#define GR_LOG_DEBUG(logger, msg) std::cout<<"DEBUG:"<<msg<<std::endl -#define GR_LOG_INFO(logger, msg) std::cout<<"INFO:"<<msg<<std::endl -#define GR_LOG_NOTICE(logger, msg) std::cout<<"NOTICE:"<<msg<<std::endl -#define GR_LOG_WARN(logger, msg) std::cerr<<"WARN:"<<msg<<std::endl -#define GR_LOG_ERROR(logger, msg) std::cerr<<"ERROR:"<<msg<<std::endl -#define GR_LOG_ALERT(logger, msg) std::cerr<<"ALERT:"<<msg<<std::endl -#define GR_LOG_CRIT(logger, msg) std::cerr<<"CRIT:"<<msg<<std::endl -#define GR_LOG_FATAL(logger, msg) std::cerr<<"FATAL:"<<msg<<std::endl -#define GR_LOG_EMERG(logger, msg) std::cerr<<"EMERG:"<<msg<<std::endl -#define GR_LOG_ERRORIF(logger, cond, msg) if((cond)) std::cerr<<"ERROR:"<<msg<<std::endl -#define GR_LOG_ASSERT(logger, cond, msg) std::cerr<<"ERROR:"<<msg<<std::endl; assert(cond) +#define GR_DEBUG(name, msg) std::cout<<"DEBUG: "<<msg<<std::endl +#define GR_INFO(name, msg) std::cout<<"INFO: "<<msg<<std::endl +#define GR_NOTICE(name, msg) std::cout<<"NOTICE: "<<msg<<std::endl +#define GR_WARN(name, msg) std::cerr<<"WARN: "<<msg<<std::endl +#define GR_ERROR(name, msg) std::cerr<<"ERROR: "<<msg<<std::endl +#define GR_ALERT(name, msg) std::cerr<<"ERROR: "<<msg<<std::endl +#define GR_CRIT(name, msg) std::cerr<<"ERROR: "<<msg<<std::endl +#define GR_FATAL(name, msg) std::cerr<<"FATAL: "<<msg<<std::endl +#define GR_EMERG(name, msg) std::cerr<<"EMERG: "<<msg<<std::endl +#define GR_ERRORIF(name, cond, msg) if((cond)) std::cerr<<"ERROR: "<<msg<<std::endl +#define GR_ASSERT(name, cond, msg) if(!(cond)) std::cerr<<"ERROR: "<<msg<<std::endl; assert(cond) +#define GR_LOG_DEBUG(logger, msg) std::cout<<"DEBUG: "<<msg<<std::endl +#define GR_LOG_INFO(logger, msg) std::cout<<"INFO: "<<msg<<std::endl +#define GR_LOG_NOTICE(logger, msg) std::cout<<"NOTICE: "<<msg<<std::endl +#define GR_LOG_WARN(logger, msg) std::cerr<<"WARN: "<<msg<<std::endl +#define GR_LOG_ERROR(logger, msg) std::cerr<<"ERROR: "<<msg<<std::endl +#define GR_LOG_ALERT(logger, msg) std::cerr<<"ALERT: "<<msg<<std::endl +#define GR_LOG_CRIT(logger, msg) std::cerr<<"CRIT: "<<msg<<std::endl +#define GR_LOG_FATAL(logger, msg) std::cerr<<"FATAL: "<<msg<<std::endl +#define GR_LOG_EMERG(logger, msg) std::cerr<<"EMERG: "<<msg<<std::endl +#define GR_LOG_ERRORIF(logger, cond, msg) if((cond)) std::cerr<<"ERROR: "<<msg<<std::endl +#define GR_LOG_ASSERT(logger, cond, msg) std::cerr<<"ERROR: "<<msg<<std::endl; assert(cond) #else /* HAVE_LOG4CPP */ // Second configuration...logging to log4cpp diff --git a/gnuradio-core/src/lib/runtime/qa_gr_logger.cc b/gnuradio-core/src/lib/runtime/qa_gr_logger.cc index e409c6aea7..a8e4a1d766 100644 --- a/gnuradio-core/src/lib/runtime/qa_gr_logger.cc +++ b/gnuradio-core/src/lib/runtime/qa_gr_logger.cc @@ -41,13 +41,12 @@ qa_gr_logger::t1() GR_LOG_GETLOGGER(LOG,"main"); GR_ADD_CONSOLE_APPENDER("main","cout","%d{%H:%M:%S} : %m%n"); - GR_LOG_NOTICE(LOG,"test from c++ 1"); - GR_LOG_DEBUG(LOG,"test from c++ 1"); - GR_LOG_INFO(LOG,"test from c++ 1"); - GR_LOG_WARN(LOG,"test from c++ 1"); - GR_LOG_ERROR(LOG,"test from c++ 1"); - GR_LOG_FATAL(LOG,"test from c++ 1"); - GR_LOG_ERRORIF(LOG,2>1,"test from c++ 1"); + GR_LOG_NOTICE(LOG,"test from c++ NOTICE"); + GR_LOG_DEBUG(LOG,"test from c++ DEBUG"); + GR_LOG_INFO(LOG,"test from c++ INFO"); + GR_LOG_WARN(LOG,"test from c++ WARN"); + GR_LOG_ERROR(LOG,"test from c++ ERROR"); + GR_LOG_FATAL(LOG,"test from c++ FATAL"); CPPUNIT_ASSERT(true); #endif } |