Changeset 10655 for trunk/daemon/daemon.c

Timestamp:

May 18, 2010, 8:37:49 PM (12 years ago)

Author:

charles

Message:

(trunk daemon) add pidfile support to transmission-daemon

File:

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

trunk/daemon/daemon.c

@@ -44 +44 @@
 static tr_bool closing = FALSE;
 static tr_session * mySession = NULL;
+static const char * pid_filename = NULL;
 
 /***
@@ -101 +102 @@
     { 953, "global-seedratio", "All torrents, unless overridden by a per-torrent setting, should seed until a specific ratio", "gsr", 1, "ratio" },
     { 954, "no-global-seedratio", "All torrents, unless overridden by a per-torrent setting, should seed regardless of ratio", "GSR", 0, NULL },
+    { 'x', "pid-file", "Enable PID file", "x", 1, "<pid-file>" },
     { 0, NULL, NULL, NULL, 0, NULL }
 };
@@ -402 +404 @@
                       tr_bencDictAddStr( &settings, TR_PREFS_KEY_RPC_BIND_ADDRESS, optarg );
                       break;
-            case 953:
-                      tr_bencDictAddReal( &settings, TR_PREFS_KEY_RATIO, atof(optarg) );
-                      tr_bencDictAddBool( &settings, TR_PREFS_KEY_RATIO_ENABLED, TRUE );
-                      break;
-            case 954:
-                      tr_bencDictAddBool( &settings, TR_PREFS_KEY_RATIO_ENABLED, FALSE );
-                      break;
-            case 'y': tr_bencDictAddBool( &settings, TR_PREFS_KEY_LPD_ENABLED, TRUE );
-                      break;
-            case 'Y': tr_bencDictAddBool( &settings, TR_PREFS_KEY_LPD_ENABLED, FALSE );
-                      break;
+            case 953:
+                      tr_bencDictAddReal( &settings, TR_PREFS_KEY_RATIO, atof(optarg) );
+                      tr_bencDictAddBool( &settings, TR_PREFS_KEY_RATIO_ENABLED, TRUE );
+                      break;
+            case 954:
+                      tr_bencDictAddBool( &settings, TR_PREFS_KEY_RATIO_ENABLED, FALSE );
+                      break;
+            case 'x': pid_filename = optarg;
+                      break;
+            case 'y': tr_bencDictAddBool( &settings, TR_PREFS_KEY_LPD_ENABLED, TRUE );
+                      break;
+            case 'Y': tr_bencDictAddBool( &settings, TR_PREFS_KEY_LPD_ENABLED, FALSE );
+                      break;
             default:  showUsage( );
                       break;
@@ -447 +451 @@
     tr_ninf( NULL, "Using settings from \"%s\"", configDir );
     tr_sessionSaveSettings( mySession, configDir, &settings );
+
+    if( pid_filename != NULL ) {
+        FILE * fp = fopen( pid_filename, "w+" );
+        if( fp != NULL ) {
+            fprintf( fp, "%d", (int)getpid() );
+            fclose( fp );
+        }
+    }
 
     if( tr_bencDictFindBool( &settings, TR_PREFS_KEY_RPC_AUTH_REQUIRED, &boolVal ) && boolVal )
@@ -479 +491 @@
 #ifdef HAVE_SYSLOG
     if( !foreground )
-        openlog( MY_NAME, LOG_CONS, LOG_DAEMON );
+        openlog( MY_NAME, LOG_CONS|LOG_PID, LOG_DAEMON );
 #endif