tweak the logging a bit.

This commit is contained in:
Charles Kerr 2007-10-22 18:52:36 +00:00
parent e1fbd16941
commit a5946e396c
4 changed files with 28 additions and 12 deletions

View File

@ -16,6 +16,7 @@
#include <limits.h> /* UCHAR_MAX */
#include <string.h>
#include <stdio.h>
#include <libgen.h> /* basename */
#include <sys/types.h> /* event.h needs this */
#include <event.h>
@ -139,17 +140,20 @@ myDebug( const char * file, int line, const tr_handshake * handshake, const char
if( fp != NULL )
{
va_list args;
struct evbuffer * buf = evbuffer_new( );
char timestr[64];
struct evbuffer * buf = evbuffer_new( );
char * myfile = tr_strdup( file );
evbuffer_add_printf( buf, "[%s] %s: ",
tr_getLogTimeStr( timestr, sizeof(timestr) ),
tr_peerIoGetAddrStr( handshake->io ) );
va_start( args, fmt );
evbuffer_add_vprintf( buf, fmt, args );
va_end( args );
evbuffer_add_printf( buf, " (%s:%d)\n", file, line );
evbuffer_add_printf( buf, " (%s:%d)\n", basename(myfile), line );
fwrite( EVBUFFER_DATA(buf), 1, EVBUFFER_LENGTH(buf), fp );
tr_free( myfile );
evbuffer_free( buf );
}
}

View File

@ -15,6 +15,7 @@
#include <stdlib.h> /* qsort */
#include <stdio.h> /* printf */
#include <limits.h> /* INT_MAX */
#include <libgen.h> /* basename */
#include <sys/types.h> /* event.h needs this */
#include <event.h>
@ -138,17 +139,20 @@ myDebug( const char * file, int line, const Torrent * t, const char * fmt, ... )
if( fp != NULL )
{
va_list args;
struct evbuffer * buf = evbuffer_new( );
char timestr[64];
struct evbuffer * buf = evbuffer_new( );
char * myfile = tr_strdup( file );
evbuffer_add_printf( buf, "[%s] ", tr_getLogTimeStr( timestr, sizeof(timestr) ) );
if( t != NULL )
evbuffer_add_printf( buf, "%s ", t->tor->info.name );
va_start( args, fmt );
evbuffer_add_vprintf( buf, fmt, args );
va_end( args );
evbuffer_add_printf( buf, " (%s:%d)\n", file, line );
evbuffer_add_printf( buf, " (%s:%d)\n", basename(myfile), line );
fwrite( EVBUFFER_DATA(buf), 1, EVBUFFER_LENGTH(buf), fp );
tr_free( myfile );
evbuffer_free( buf );
}
}

View File

@ -16,6 +16,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <libgen.h> /* basename */
#include <arpa/inet.h>
@ -156,8 +157,10 @@ myDebug( const char * file, int line,
if( fp != NULL )
{
va_list args;
struct evbuffer * buf = evbuffer_new( );
char timestr[64];
struct evbuffer * buf = evbuffer_new( );
char * myfile = tr_strdup( file );
evbuffer_add_printf( buf, "[%s] %s [%s]: ",
tr_getLogTimeStr( timestr, sizeof(timestr) ),
tr_peerIoGetAddrStr( msgs->io ),
@ -165,9 +168,10 @@ myDebug( const char * file, int line,
va_start( args, fmt );
evbuffer_add_vprintf( buf, fmt, args );
va_end( args );
evbuffer_add_printf( buf, " (%s:%d)\n", file, line );
evbuffer_add_printf( buf, " (%s:%d)\n", basename(myfile), line );
fwrite( EVBUFFER_DATA(buf), 1, EVBUFFER_LENGTH(buf), fp );
tr_free( myfile );
evbuffer_free( buf );
}
}

View File

@ -15,6 +15,7 @@
#include <stdio.h> /* snprintf */
#include <stdlib.h>
#include <string.h> /* strcmp, strchr */
#include <libgen.h> /* basename */
#include <sys/queue.h> /* libevent needs this */
#include <sys/types.h> /* libevent needs this */
@ -124,17 +125,20 @@ myDebug( const char * file, int line, const tr_tracker * t, const char * fmt, ..
if( fp != NULL )
{
va_list args;
struct evbuffer * buf = evbuffer_new( );
char timestr[64];
struct evbuffer * buf = evbuffer_new( );
char * myfile = tr_strdup( file );
evbuffer_add_printf( buf, "[%s] ", tr_getLogTimeStr( timestr, sizeof(timestr) ) );
if( t != NULL )
evbuffer_add_printf( buf, "%s ", t->name );
va_start( args, fmt );
evbuffer_add_vprintf( buf, fmt, args );
va_end( args );
evbuffer_add_printf( buf, " (%s:%d)\n", file, line );
evbuffer_add_printf( buf, " (%s:%d)\n", basename(myfile), line );
fwrite( EVBUFFER_DATA(buf), 1, EVBUFFER_LENGTH(buf), fp );
tr_free( myfile );
evbuffer_free( buf );
}
}