Changeset 13330

Timestamp:

May 30, 2012, 5:59:52 PM (9 years ago)

Author:

jordan

Message:

(trunmk libT) #4162 "daemon should reopen logfile on SIGHUP" -- patch from gvdl to reopen the logfile on SIGHUP s.t. log rotation can be used by outside tools

File:

• trunk/daemon/daemon.c (modified) (4 diffs)

trunk/daemon/daemon.c

@@ -58 +58 @@
 #define SPEED_T_STR "TB/s"
 
+#define LOGFILE_MODE_STR "a+"
+
 static bool paused = false;
 static bool closing = false;
 static bool seenHUP = false;
+static const char *logfileName = NULL;
+static FILE *logfile = NULL;
 static tr_session * mySession = NULL;
 
@@ -151 +155 @@
             {
                 tr_benc settings;
-                const char * configDir = tr_sessionGetConfigDir( mySession );
+                const char * configDir;
+
+                /* reopen the logfile to allow for log rotation */
+                if( logfileName ) {
+                    logfile = freopen( logfileName, LOGFILE_MODE_STR, logfile );
+                    if( !logfile )
+                        fprintf( stderr, "Couldn't reopen \"%s\": %s\n", logfileName, tr_strerror( errno ) );
+                }
+
+                configDir = tr_sessionGetConfigDir( mySession );
                 tr_inf( "Reloading settings from \"%s\"", configDir );
                 tr_bencInitDict( &settings, 0 );
@@ -354 +367 @@
     const char * pid_filename;
     dtr_watchdir * watchdir = NULL;
-    FILE * logfile = NULL;
     bool pidfile_created = false;
     tr_session * session = NULL;
@@ -393 +405 @@
             case 'd': dumpSettings = true;
                       break;
-            case 'e': logfile = fopen( optarg, "a+" );
-                      if( logfile == NULL )
+            case 'e': logfile = fopen( optarg, LOGFILE_MODE_STR );
+                      if( logfile )
+                          logfileName = optarg;
+                      else
                           fprintf( stderr, "Couldn't open \"%s\": %s\n", optarg, tr_strerror( errno ) );
                       break;