Changeset 113

Timestamp:

10/19/09 08:24:25 (2 months ago)

Author:

wimpunk

Message:

Added foreground patch (1893144) submitted by John Palkovic

Location:

trunk

Files:

• ddclient (modified) (4 diffs)
• patches/foreground.patch (added)

trunk/ddclient

@@ -310 +310 @@
     'global-defaults'    => {
         'daemon'              => setv(T_DELAY, 0, 0, 1, 0,                    interval('60s')),
+        'foreground'          => setv(T_BOOL,  0, 0, 1, 0,                    undef),
         'file'                => setv(T_FILE,  0, 0, 1, "$etc$program.conf",  undef),
         'cache'               => setv(T_FILE,  0, 0, 1, "$cachedir$program.cache", undef),
@@ -549 +550 @@
     "options are:",
     [ "daemon",      "=s", "-daemon delay         : run as a daemon, specify delay as an interval." ],
++     [ "foreground",  "!",  "-foreground           : do not fork" ],
     [ "proxy",       "=s", "-proxy host           : use 'host' as the HTTP proxy" ],
     [ "server",      "=s", "-server host          : update DNS information on 'host'" ],
@@ -637 +639 @@
 $SIG{'TERM'}   = sub { $caught_term = 1; };
 $SIG{'KILL'}   = sub { $caught_kill = 1; };
-if (opt('daemon') && !opt('force')) {
+# don't fork() if foreground or force is on
+if (opt('foreground') || opt('force')) {
+    ;
+} elsif (opt('daemon')) {
     $SIG{'CHLD'}   = 'IGNORE';
     my $pid = fork;
@@ -647 +652 @@
     }
     $SIG{'CHLD'}   = 'DEFAULT';
-    $opt{'syslog'} = 1;
     open(STDOUT, ">/dev/null");
     open(STDERR, ">/dev/null");
     open(STDIN,  "</dev/null");
-
+}
+
+# write out the pid file if we're daemon'ized
+if(opt('daemon')) { 
     write_pid();
+    $opt{'syslog'} = 1;
 }