actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

handle multi-line logs

Browse Source
This commit is contained in:
Glenn Maynard
2003-12-19 00:53:45 +00:00
parent 19ff522f3d
commit e67a108759
1 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageLog.cpp
+35 -28
View File
@@ -225,41 +225,48 @@ void RageLog::Warn( const char *fmt, ...)
CString sBuff = vssprintf( fmt, va ); CString sBuff = vssprintf( fmt, va );
va_end(va); va_end(va);
Write(WRITE_TO_INFO | WRITE_LOUD, ssprintf("WARNING: %s", sBuff.c_str())); Write( WRITE_TO_INFO | WRITE_LOUD, sBuff );
} }
void RageLog::Write( int where, CString str) void RageLog::Write( int where, CString line )
{ {
if( m_bTimestamping ) vector<CString> lines;
str = SecondsToTime(RageTimer::GetTimeSinceStart()) + ": " + str; split( line, "\n", lines, false );
if( g_fileLog.IsOpen() && (where & WRITE_LOUD) )
if( where&WRITE_TO_INFO && g_fileInfo.IsOpen() ) g_fileLog.PutLine( "/////////////////////////////////////////" );
g_fileInfo.PutLine( str );
if( HOOKS )
HOOKS->Log( str, where & WRITE_TO_INFO );
if( where & WRITE_TO_INFO )
AddToInfo( str );
AddToRecentLogs( str );
/* Only do this for log.txt and stdout. The other outputs are
* fairly quiet anyway, so the prepended "WARNING" makes them stand
* out well enough and this is just clutter. */
if( where & WRITE_LOUD ) if( where & WRITE_LOUD )
printf( "/////////////////////////////////////////\n" );
for( unsigned i = 0; i < lines.size(); ++i )
{ {
str = ssprintf( CString &str = lines[i];
"/////////////////////////////////////////\n"
"%s\n" if( where & WRITE_LOUD )
"/////////////////////////////////////////", str = "WARNING: " + str;
str.c_str()); if( m_bTimestamping )
str = SecondsToTime(RageTimer::GetTimeSinceStart()) + ": " + str;
if( where&WRITE_TO_INFO && g_fileInfo.IsOpen() )
g_fileInfo.PutLine( str );
if( HOOKS )
HOOKS->Log( str, where & WRITE_TO_INFO );
if( where & WRITE_TO_INFO )
AddToInfo( str );
AddToRecentLogs( str );
if( g_fileLog.IsOpen() )
g_fileLog.PutLine( str );
if( m_bShowLogOutput || where != 0 )
printf("%s\n", str.c_str() );
} }
if( g_fileLog.IsOpen() ) if( g_fileLog.IsOpen() && (where & WRITE_LOUD) )
g_fileLog.PutLine( str ); g_fileLog.PutLine( "/////////////////////////////////////////" );
if( where & WRITE_LOUD )
if( m_bShowLogOutput || where != 0 ) printf( "/////////////////////////////////////////\n" );
printf("%s\n", str.c_str() );
if( m_bFlush || (where & WRITE_TO_INFO) ) if( m_bFlush || (where & WRITE_TO_INFO) )
Flush(); Flush();