Author: sh-sh-sh Date: Thu Mar 6 14:13:26 2008 New Revision: 45265 URL: http://svn.opensuse.org/viewcvs/yast?rev=45265&view=rev Log: fixed debug logging Modified: trunk/libyui/src/YUILog.cc Modified: trunk/libyui/src/YUILog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/src/YUILog.cc?rev=45265&r1=45264&r2=45265&view=diff ============================================================================== --- trunk/libyui/src/YUILog.cc (original) +++ trunk/libyui/src/YUILog.cc Thu Mar 6 14:13:26 2008 @@ -117,40 +117,37 @@ std::streamsize YUILogBuffer::writeBuffer( const char * sequence, std::streamsize seqLen ) { - if ( logLevel != YUI_LOG_DEBUG || YUILog::debugLoggingEnabled() ) - { - // Add new character sequence - - if ( seqLen > 0 ) - buffer += string( sequence, seqLen ); + // Add new character sequence - // - // Output buffer contents line by line - // + if ( seqLen > 0 ) + buffer += string( sequence, seqLen ); - std::size_t start = 0; - std::size_t newline_pos = 0; + // + // Output buffer contents line by line + // - while ( start < buffer.length() && - ( newline_pos = buffer.find_first_of( '\n', start ) ) != string::npos ) - { - YUILoggerFunction loggerFunction = YUILog::loggerFunction( true ); // never return 0 + std::size_t start = 0; + std::size_t newline_pos = 0; - string line = buffer.substr( start, newline_pos - start ); + while ( start < buffer.length() && + ( newline_pos = buffer.find_first_of( '\n', start ) ) != string::npos ) + { + YUILoggerFunction loggerFunction = YUILog::loggerFunction( true ); // never return 0 - loggerFunction( logLevel, logComponent, - sourceFileName, lineNo, functionName, - line.c_str() ); + string line = buffer.substr( start, newline_pos - start ); - start = newline_pos + 1; - } + loggerFunction( logLevel, logComponent, + sourceFileName, lineNo, functionName, + line.c_str() ); - if ( start < buffer.length() ) - buffer = buffer.substr( start, string::npos ); - else - buffer.clear(); + start = newline_pos + 1; } + if ( start < buffer.length() ) + buffer = buffer.substr( start, string::npos ); + else + buffer.clear(); + return seqLen; } @@ -256,7 +253,7 @@ : loggerFunction( stderrLogger ) , enableDebugLoggingHook( 0 ) , debugLoggingEnabledHook( 0 ) - , enableDebugLogging( true ) + , enableDebugLogging( false ) {} /** @@ -472,7 +469,12 @@ switch ( logLevel ) { - case YUI_LOG_DEBUG: logLevelStr = "dbg"; break; + case YUI_LOG_DEBUG: if ( ! YUILog::debugLoggingEnabled ) + return; + + logLevelStr = "dbg"; + break; + case YUI_LOG_MILESTONE: logLevelStr = "_M_"; break; case YUI_LOG_WARNING: logLevelStr = "WRN"; break; case YUI_LOG_ERROR: logLevelStr = "ERR"; break; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org