Changeset 11239

Timestamp:

08/19/08 15:38:38 (5 months ago)

Author:

/C=ES/O=Warp Networks S.L./CN=ejhernandez@…

Message:

Added upstart conf file and added foreground option to be run runnerd under upstart supervision refs #1103

Location:

branches/remote-services/ebox

Files:

• debian/ebox.runnerd.upstart (added)
• src/libexec/ebox-runnerd (modified) (3 diffs)

branches/remote-services/ebox/src/libexec/ebox-runnerd

@@ -4 +4 @@
 use EBox::Config;
 use EBox::Exceptions::External;
+use Getopt::Long;
 use Linux::Inotify2;
 use POSIX qw(SIG_IGN SIGHUP);
@@ -16 +17 @@
 #     Stevens chapter 13 coding rules
 #
+# Parameters:
+#
+#     foreground - Boolean indicating if the daemon must be launched
+#     in foreground *(Optional)* Default value: false
+#
+#
 sub _daemonise
 {
+    my ($foreground) = @_;
+
     # Clear the file creation mask
     umask(0);
+
+    unless ( $foreground ) {
     # Become a session leader to lose controlling TTY
-    my $pid = fork();
-    if ( $pid < 0 ) {
-        throw EBox::Exceptions::External( "Cannot fork: $!");
-    } elsif ( $pid != 0 ) {
-        # Parent must throw EBox::Exceptions::External(
-        exit(0);
+        my $pid = fork();
+        if ( $pid < 0 ) {
+            throw EBox::Exceptions::External( "Cannot fork: $!");
+        } elsif ( $pid != 0 ) {
+            # Parent must throw EBox::Exceptions::External(
+            exit(0);
+        }
+        POSIX::setsid();
     }
-    POSIX::setsid();
 
     # Ensure future opens won't allocate controlling TTYs
     POSIX::sigaction(POSIX::SIGHUP, POSIX::SigAction->new( POSIX::SIG_IGN ))
         or throw EBox::Exceptions::External( "Cannot ignore SIGHUP: $!");
-    my $pid = fork();
-    if ( $pid < 0 ) {
-        throw EBox::Exceptions::External( "Cannot fork: $!");
-    } elsif ( $pid != 0 ) {
-        # Parent must die
-        exit(0);
+    unless ( $foreground ) {
+        my $pid = fork();
+        if ( $pid < 0 ) {
+            throw EBox::Exceptions::External( "Cannot fork: $!");
+        } elsif ( $pid != 0 ) {
+            # Parent must die
+            exit(0);
+        }
     }
 
@@ -106 +120 @@
 
 # MAIN
+
+# Get arguments
+my ($foreground) = (0);
+my $result = GetOptions( 'foreground' => \$foreground );
+
 EBox::init();
-_daemonise();
+_daemonise($foreground);
 
 my $incomingSub = sub {