Changeset 1d2e3c2 for conf.c

Timestamp:

2006-02-02T13:59:14Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ec3e411

Parents:

34b17d9 (diff), a49dcd5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Added RESTART command for easier upgrades without losing IPC connections.
(Obviously only works well for forking daemon mode.)

File:

• conf.c (modified) (3 diffs)

conf.c

@@ -32 +32 @@
 #include "ini.h"
 #include "url.h"
+#include "ipc.h"
 
 #include "protocols/proxy.h"
@@ -78 +79 @@
         }
         
-        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:h" ) ) >= 0 )
+        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:" ) ) >= 0 )
         /*     ^^^^ Just to make sure we skip this step from the REHASH handler. */
         {
@@ -147 +148 @@
                                 "  -h  Show this help page.\n" );
                         return( NULL );
+                }
+                else if( opt == 'R' )
+                {
+                        /* We can't load the statefile yet (and should make very sure we do this
+                           only once), so set the filename here and load the state information
+                           when initializing ForkDaemon. (This option only makes sense in that
+                           mode anyway!) */
+                        ipc_master_set_statefile( optarg );
                 }
         }