Author: aschnell Date: Sun Jul 27 10:56:51 2008 New Revision: 49437 URL: http://svn.opensuse.org/viewcvs/yast?rev=49437&view=rev Log: - some cleanup in logging functions Modified: trunk/storage/libstorage/src/AppUtil.cc trunk/storage/libstorage/src/AppUtil.h trunk/storage/libstorage/src/DerefIterator.h trunk/storage/libstorage/src/FilterIterator.h trunk/storage/libstorage/src/ListListIterator.h trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/StorageTmpl.h Modified: trunk/storage/libstorage/src/AppUtil.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.cc?rev=49437&r1=49436&r2=49437&view=diff ============================================================================== --- trunk/storage/libstorage/src/AppUtil.cc (original) +++ trunk/storage/libstorage/src/AppUtil.cc Sun Jul 27 10:56:51 2008 @@ -335,22 +335,69 @@ dev.erase( 0, 5 ); } -static blocxx::String component = "libstorage"; -void -log_msg( unsigned level, const char* file, unsigned line, const char* func, - const char* add_str, const char* format, ... ) +static const blocxx::String component = "libstorage"; + + +void createLogger(const string& lcomponent, const string& name, + const string& logpath, const string& logfile) +{ + using namespace blocxx; + + if (logpath != "NULL" && logfile != "NULL") { + String nm = name.c_str(); + LoggerConfigMap configItems; + LogAppenderRef logApp; + if (logpath != "STDERR" && logfile != "STDERR" && + logpath != "SYSLOG" && logfile != "SYSLOG") + { + String StrKey; + String StrPath; + StrKey.format("log.%s.location", name.c_str()); + StrPath = (logpath + "/" + logfile).c_str(); + configItems[StrKey] = StrPath; + logApp = + LogAppender::createLogAppender(nm, LogAppender::ALL_COMPONENTS, + LogAppender::ALL_CATEGORIES, + "%d %-5p %c(%P) %F(%M):%L - %m", + LogAppender::TYPE_FILE, + configItems); + } + else if (logpath == "STDERR" && logfile == "STDERR") + { + logApp = + LogAppender::createLogAppender(nm, LogAppender::ALL_COMPONENTS, + LogAppender::ALL_CATEGORIES, + "%d %-5p %c(%P) %F(%M):%L - %m", + LogAppender::TYPE_STDERR, + configItems); + } + else + { + logApp = + LogAppender::createLogAppender(nm, LogAppender::ALL_COMPONENTS, + LogAppender::ALL_CATEGORIES, + "%d %-5p %c(%P) %F(%M):%L - %m", + LogAppender::TYPE_SYSLOG, + configItems); + } + + LogAppender::setDefaultLogAppender(logApp); + } +} + + +void +logMsg(unsigned level, const char* file, unsigned line, const char* func, + const string& str) +{ using namespace blocxx; -#if BLOCXX_LIBRARY_VERSION >= 5 - ELogLevel curLevel = LogAppender::getCurrentLogAppender()->getLogLevel(); -#else - ELogLevel curLevel = Logger::getCurrentLogger()->getLogLevel(); -#endif - String category; + ELogLevel curLevel = LogAppender::getCurrentLogAppender()->getLogLevel(); + String category; switch( level ) - { + { case 0: if( curLevel >= ::blocxx::E_DEBUG_LEVEL) category = Logger::STR_DEBUG_CATEGORY; @@ -360,17 +407,8 @@ category = Logger::STR_INFO_CATEGORY; break; case 2: -#if BLOCXX_LIBRARY_VERSION >= 5 if( curLevel >= ::blocxx::E_WARNING_LEVEL) category = Logger::STR_WARNING_CATEGORY; -#else - if( curLevel >= ::blocxx::E_INFO_LEVEL) - { - category = Logger::STR_INFO_CATEGORY; - if( add_str == NULL ) - add_str = "[WARNING]"; - } -#endif break; case 3: if( curLevel >= ::blocxx::E_ERROR_LEVEL) @@ -380,101 +418,33 @@ if( curLevel >= ::blocxx::E_FATAL_ERROR_LEVEL) category = Logger::STR_FATAL_CATEGORY; break; - } - - if( !category.empty()) - { - char b[4096+1] = {'\0'}; - unsigned ret = 0; - if( add_str != NULL && *add_str != '\0') - ret = snprintf( b, sizeof(b), "%s ", add_str ); - if( ret= 5 - LogAppender::getCurrentLogAppender()->logMessage( LogMessage(component, category, String(b), file, line , func) ); -#else - Logger::getCurrentLogger()->logMessage( component, category, String(b), file, line , func ); -#endif - } } -int createLogger( const string& lcomponent, const string& name, - const string& logpath, const string& logfile ) + if (!category.empty()) { - using namespace blocxx; + LogAppender::getCurrentLogAppender()->logMessage(LogMessage(component, category, + String(str), file, + line, func)); + } +} -#if BLOCXX_LIBRARY_VERSION < 5 - // Add PID to our global component name in blocxx-1.x - // that does not support the %P log format specifier. - component = "libstorage(" + decString(getpid()) + ")"; -#endif - if( logpath != "NULL" && logfile != "NULL" ) - { - String nm = name.c_str(); - LoggerConfigMap configItems; - LogAppenderRef logApp; - if( logpath != "STDERR" && logfile != "STDERR" && - logpath != "SYSLOG" && logfile != "SYSLOG" ) - { - String StrKey; - String StrPath; - StrKey.format("log.%s.location", name.c_str()); - StrPath = (logpath + "/" + logfile).c_str(); - configItems[StrKey] = StrPath; - logApp = - LogAppender::createLogAppender( nm, LogAppender::ALL_COMPONENTS, - LogAppender::ALL_CATEGORIES, -#if BLOCXX_LIBRARY_VERSION >= 5 - "%d %-5p %c(%P) %F(%M):%L - %m", -#else - "%d %-5p %c %F(%M):%L - %m", -#endif - LogAppender::TYPE_FILE, - configItems ); - } - else if( logpath == "STDERR" && logfile == "STDERR" ) - { - logApp = - LogAppender::createLogAppender( nm, LogAppender::ALL_COMPONENTS, - LogAppender::ALL_CATEGORIES, -#if BLOCXX_LIBRARY_VERSION >= 5 - "%d %-5p %c(%P) %F(%M):%L - %m", -#else - "%d %-5p %c %F(%M):%L - %m", -#endif - LogAppender::TYPE_STDERR, - configItems ); - } - else - { - logApp = - LogAppender::createLogAppender( nm, LogAppender::ALL_COMPONENTS, - LogAppender::ALL_CATEGORIES, -#if BLOCXX_LIBRARY_VERSION >= 5 - "%d %-5p %c(%P) %F(%M):%L - %m", -#else - "%d %-5p %c %F(%M):%L - %m", -#endif - LogAppender::TYPE_SYSLOG, - configItems ); - } -#if BLOCXX_LIBRARY_VERSION >= 5 - LogAppender::setDefaultLogAppender(logApp); -#else - LoggerRef log( new AppenderLogger( lcomponent.c_str(), E_INFO_LEVEL, - logApp)); - Logger::setDefaultLogger(log); -#endif - } - return( 0 ); - } +void +logMsgVaArgs(unsigned level, const char* file, unsigned line, const char* func, + const char* format, ...) +{ + char* str; + va_list ap; + + va_start(ap, format); + if (vasprintf(&str, format, ap) == -1) + return; + va_end(ap); + + logMsg(level, file, line, func, str); + + free(str); +} void getFindMap( const char* path, map& m, bool unique ) Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h?rev=49437&r1=49436&r2=49437&view=diff ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Sun Jul 27 10:56:51 2008 @@ -51,32 +51,35 @@ void delay(int Microsec_iv); unsigned getMajorDevices( const string& driver ); -int createLogger( const string& component, const string& name, - const string& logpath, const string& logfile ); +void createLogger(const string& component, const string& name, + const string& logpath, const string& logfile); -void log_msg( unsigned level, const char* file, unsigned line, - const char* func, const char* add_str, const char* format, ... ) - __attribute__ ((format(printf, 6, 7))); - -#define y2debug(format, ...) \ - log_msg( 0, __FILE__, __LINE__, __FUNCTION__, NULL, format, ##__VA_ARGS__ ) -#define y2milestone(format, ...) \ - log_msg( 1, __FILE__, __LINE__, __FUNCTION__, NULL, format, ##__VA_ARGS__ ) -#define y2warning(format, ...) \ - log_msg( 2, __FILE__, __LINE__, __FUNCTION__, NULL, format, ##__VA_ARGS__ ) -#define y2error(format, ...) \ - log_msg( 3, __FILE__, __LINE__, __FUNCTION__, NULL, format, ##__VA_ARGS__ ) - -#define y2deb(op) log_op( 0, __FILE__, __LINE__, __FUNCTION__, NULL, op ) -#define y2mil(op) log_op( 1, __FILE__, __LINE__, __FUNCTION__, NULL, op ) -#define y2war(op) log_op( 2, __FILE__, __LINE__, __FUNCTION__, NULL, op ) -#define y2err(op) log_op( 3, __FILE__, __LINE__, __FUNCTION__, NULL, op ) - -#define log_op(level, file, line, function, add, op) \ - do { \ - std::ostringstream __buf; \ - __buf << op; \ - log_msg(level, file, line, function, add, "%s", __buf.str().c_str()); \ +void logMsg(unsigned level, const char* file, unsigned line, + const char* func, const string& str); + +void logMsgVaArgs(unsigned level, const char* file, unsigned line, + const char* func, const char* format, ...) + __attribute__ ((format(printf, 5, 6))); + +#define y2debug(format, ...) \ + logMsgVaArgs(0, __FILE__, __LINE__, __FUNCTION__, format, ##__VA_ARGS__) +#define y2milestone(format, ...) \ + logMsgVaArgs(1, __FILE__, __LINE__, __FUNCTION__, format, ##__VA_ARGS__) +#define y2warning(format, ...) \ + logMsgVaArgs(2, __FILE__, __LINE__, __FUNCTION__, format, ##__VA_ARGS__) +#define y2error(format, ...) \ + logMsgVaArgs(3, __FILE__, __LINE__, __FUNCTION__, format, ##__VA_ARGS__) + +#define y2deb(op) y2log_op(0, __FILE__, __LINE__, __FUNCTION__, op) +#define y2mil(op) y2log_op(1, __FILE__, __LINE__, __FUNCTION__, op) +#define y2war(op) y2log_op(2, __FILE__, __LINE__, __FUNCTION__, op) +#define y2err(op) y2log_op(3, __FILE__, __LINE__, __FUNCTION__, op) + +#define y2log_op(level, file, line, function, op) \ + do { \ + std::ostringstream __buf; \ + __buf << op; \ + logMsg(level, file, line, function, __buf.str()); \ } while (0) string sformat(const char* format, ...); Modified: trunk/storage/libstorage/src/DerefIterator.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DerefIterator.h?rev=49437&r1=49436&r2=49437&view=diff ============================================================================== --- trunk/storage/libstorage/src/DerefIterator.h (original) +++ trunk/storage/libstorage/src/DerefIterator.h Sun Jul 27 10:56:51 2008 @@ -23,7 +23,7 @@ DerefIterator& operator++() { Iter::operator++(); return(*this); } DerefIterator operator++(int) { - y2warning( "Expensive ++ DerefIterator" ); + y2war( "Expensive ++ DerefIterator" ); DerefIterator tmp(*this); Iter::operator++(); return(tmp); @@ -31,7 +31,7 @@ DerefIterator& operator--() { Iter::operator--(); return(*this); } DerefIterator operator--(int) { - y2warning( "Expensive -- DerefIterator" ); + y2war( "Expensive -- DerefIterator" ); DerefIterator tmp(*this); Iter::operator--(); return(tmp); Modified: trunk/storage/libstorage/src/FilterIterator.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/FilterIterator.h?rev=49437&r1=49436&r2=49437&view=diff ============================================================================== --- trunk/storage/libstorage/src/FilterIterator.h (original) +++ trunk/storage/libstorage/src/FilterIterator.h Sun Jul 27 10:56:51 2008 @@ -50,7 +50,7 @@ } FilterIterator operator++(int) { - y2warning( "Expensive ++ FilterIterator" ); + y2war( "Expensive ++ FilterIterator" ); FilterIterator tmp(*this); ++m_cur; assertPred(); @@ -65,7 +65,7 @@ } FilterIterator operator--(int) { - y2warning( "Expensive -- FilterIterator" ); + y2war( "Expensive -- FilterIterator" ); FilterIterator tmp(*this); --m_cur; assertPred(false); Modified: trunk/storage/libstorage/src/ListListIterator.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/ListListIterator.h?rev=49437&r1=49436&r2=49437&view=diff ============================================================================== --- trunk/storage/libstorage/src/ListListIterator.h (original) +++ trunk/storage/libstorage/src/ListListIterator.h Sun Jul 27 10:56:51 2008 @@ -49,7 +49,7 @@ } ListListIterator operator++(int) { - y2warning( "Expensive ++ ListListIterator" ); + y2war( "Expensive ++ ListListIterator" ); ListListIterator tmp(*this); increment(); return tmp; @@ -62,7 +62,7 @@ } ListListIterator operator--(int) { - y2warning( "Expensive -- ListListIterator" ); + y2war( "Expensive -- ListListIterator" ); ListListIterator tmp(*this); decrement(); return tmp; Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h?rev=49437&r1=49436&r2=49437&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Sun Jul 27 10:56:51 2008 @@ -72,7 +72,7 @@ } CastCheckIterator operator++(int) { - y2warning( "Expensive ++ CastCheckIterator" ); + y2war( "Expensive ++ CastCheckIterator" ); CastCheckIterator tmp(*this); _bclass::operator++(); return(tmp); @@ -83,7 +83,7 @@ } CastCheckIterator operator--(int) { - y2warning( "Expensive -- CastCheckIterator" ); + y2war( "Expensive -- CastCheckIterator" ); CastCheckIterator tmp(*this); _bclass::operator--(); return(tmp); @@ -130,7 +130,7 @@ } CastCheckFncIterator operator++(int) { - y2warning( "Expensive ++ CastCheckFncIterator" ); + y2war( "Expensive ++ CastCheckFncIterator" ); CastCheckFncIterator tmp(*this); _bclass::operator++(); return(tmp); @@ -141,7 +141,7 @@ } CastCheckFncIterator operator--(int) { - y2warning( "Expensive -- CastCheckFncIterator" ); + y2war( "Expensive -- CastCheckFncIterator" ); CastCheckFncIterator tmp(*this); _bclass::operator--(); return(tmp); Modified: trunk/storage/libstorage/src/StorageTmpl.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageTmpl.h?rev=49437&r1=49436&r2=49437&view=diff ============================================================================== --- trunk/storage/libstorage/src/StorageTmpl.h (original) +++ trunk/storage/libstorage/src/StorageTmpl.h Sun Jul 27 10:56:51 2008 @@ -77,7 +77,7 @@ } CastIterator operator++(int) { - y2warning( "Expensive ++ CastIterator" ); + y2war( "Expensive ++ CastIterator" ); CastIterator tmp(*this); Iter::operator++(); return(tmp); @@ -88,7 +88,7 @@ } CastIterator operator--(int) { - y2warning( "Expensive -- CastIterator" ); + y2war( "Expensive -- CastIterator" ); CastIterator tmp(*this); Iter::operator--(); return(tmp); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org