mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-23 08:13:27 +00:00
Code Issues Releases Wiki Activity

(trunk daemon) #2890 "Add option to specify logfile in transmission-daemon" -- implemented for 1.90

Browse source
This commit is contained in:
Charles Kerr 2010-02-11 01:37:59 +00:00
parent 609527fbca
commit ff2dd75d9f
2 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
daemon/daemon.c
View file

@ -71,6 +71,7 @@ static const struct tr_option options[] =
{ 941, "incomplete-dir", "Where to store new torrents until they're complete", NULL, 1, "<directory>" },
{ 942, "no-incomplete-dir", "Don't store incomplete torrents in a different location", NULL, 0, NULL },
{ 'd', "dump-settings", "Dump the settings and exit", "d", 0, NULL },
{ 'e', "logfile", "Dump the log messages to this filename", "e", 1, "<filename>" },
{ 'f', "foreground", "Run in the foreground instead of daemonizing", "f", 0, NULL },
{ 'g', "config-dir", "Where to look for configuration files", "g", 1, "<path>" },
{ 'p', "port", "RPC port (Default: " TR_DEFAULT_RPC_PORT_STR ")", "p", 1, "<port>" },
@ -228,18 +229,18 @@ onFileAdded( tr_session * session, const char * dir, const char * file )
}
static void
printMessage( tr_bool foreground, int level, const char * name, const char * message, const char * file, int line )
printMessage( FILE * logfile, int level, const char * name, const char * message, const char * file, int line )
{
#ifdef HAVE_SYSLOG
if( foreground )
if( logfile != NULL )
{
char timestr[64];
tr_getLogTimeStr( timestr, sizeof( timestr ) );
if( name )
fprintf( stderr, "[%s] %s %s (%s:%d)\n", timestr, name, message, file, line );
fprintf( logfile, "[%s] %s %s (%s:%d)\n", timestr, name, message, file, line );
else
fprintf( stderr, "[%s] %s (%s:%d)\n", timestr, message, file, line );
fprintf( logfile, "[%s] %s (%s:%d)\n", timestr, message, file, line );
}
#ifdef HAVE_SYSLOG
else /* daemon... write to syslog */
{
int priority;
@ -256,26 +257,17 @@ printMessage( tr_bool foreground, int level, const char * name, const char * mes
else
syslog( priority, "%s (%s:%d)", message, file, line );
}
#else
{
char timestr[64];
tr_getLogTimeStr( timestr, sizeof( timestr ) );
if( name )
fprintf( stderr, "[%s] %s %s (%s:%d)\n", timestr, name, message, file, line );
else
fprintf( stderr, "[%s] %s (%s:%d)\n", timestr, message, file, line );
}
#endif
}
static void
pumpLogMessages( tr_bool foreground )
pumpLogMessages( FILE * logfile )
{
const tr_msg_list * l;
tr_msg_list * list = tr_getQueuedMessages( );
for( l=list; l!=NULL; l=l->next )
printMessage( foreground, l->level, l->name, l->message, l->file, l->line );
printMessage( logfile, l->level, l->name, l->message, l->file, l->line );
tr_freeMessageList( list );
}
@ -292,6 +284,7 @@ main( int argc, char ** argv )
tr_bool dumpSettings = FALSE;
const char * configDir = NULL;
dtr_watchdir * watchdir = NULL;
FILE * logfile = NULL;
signal( SIGINT, gotsig );
signal( SIGTERM, gotsig );
@ -329,6 +322,10 @@ main( int argc, char ** argv )
break;
case 'd': dumpSettings = TRUE;
break;
case 'e': logfile = fopen( optarg, "a+" );
if( logfile == NULL )
fprintf( stderr, "Couldn't open \"%s\": %s\n", optarg, tr_strerror( errno ) );
break;
case 'f': foreground = TRUE;
break;
case 'g': /* handled above */
@ -393,9 +390,12 @@ main( int argc, char ** argv )
}
}
if( foreground && !logfile )
logfile = stderr;
if( !loaded )
{
printMessage( foreground, TR_MSG_ERR, MY_NAME, "Error loading config file -- exiting.", __FILE__, __LINE__ );
printMessage( logfile, TR_MSG_ERR, MY_NAME, "Error loading config file -- exiting.", __FILE__, __LINE__ );
return -1;
}
@ -411,7 +411,7 @@ main( int argc, char ** argv )
{
char buf[256];
tr_snprintf( buf, sizeof( buf ), "Failed to dameonize: %s", tr_strerror( errno ) );
printMessage( foreground, TR_MSG_ERR, MY_NAME, buf, __FILE__, __LINE__ );
printMessage( logfile, TR_MSG_ERR, MY_NAME, buf, __FILE__, __LINE__ );
exit( 1 );
}
@ -457,7 +457,7 @@ main( int argc, char ** argv )
while( !closing ) {
tr_wait_msec( 1000 ); /* sleep one second */
dtr_watchdir_update( watchdir );
pumpLogMessages( foreground );
pumpLogMessages( logfile );
}
closelog( );

3
daemon/transmission-daemon.1
View file

@ -26,6 +26,7 @@
.Op Fl er | ep | et
.Op Fl V
.Op Fl w Ar download-dir
.Op Fl e Ar logfile
.Ek
.Sh DESCRIPTION
.Nm
@ -114,6 +115,8 @@ Used for client authentication.
Show version number and exit
.It Fl w Fl -download-dir
Where to store downloaded data.
.It Fl e Fl -logfile
Where to store transmission's log messages.
.El
.Sh ENVIRONMENT
.Bl -tag -width Fl