Changeset 11240

Timestamp:

08/19/08 15:55:59 (5 months ago)

Author:

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

Message:

Manage runnerd process in remote service regen configuration refs #1103

Location:

branches/remote-services/ebox/src

Files:

• EBox/RemoteServices.pm (modified) (4 diffs)
• libexec/ebox-runnerd (modified) (3 diffs)

branches/remote-services/ebox/src/EBox/RemoteServices.pm

@@ -35 +35 @@
 use EBox::Gettext;
 use EBox::Global;
+use EBox::Service;
 use EBox::Sudo;
 
 # Constants
-use constant SERV_DIR      => EBox::Config::conf() . 'remoteservices/';
-use constant CA_DIR        => SERV_DIR . 'ssl-ca/';
-use constant SUBS_DIR      => SERV_DIR . 'subscription/';
-use constant WS_DISPATCHER => __PACKAGE__ . '::WSDispatcher';
+use constant SERV_DIR        => EBox::Config::conf() . 'remoteservices/';
+use constant CA_DIR          => SERV_DIR . 'ssl-ca/';
+use constant SUBS_DIR        => SERV_DIR . 'subscription/';
+use constant WS_DISPATCHER   => __PACKAGE__ . '::WSDispatcher';
+use constant RUNNERD_SERVICE => 'ebox.runnerd';
 
 # Group: Protected methods
@@ -99 +101 @@
 
       $self->_confSOAPService();
+      $self->_doDaemon();
 
       return;
@@ -112 +115 @@
 sub _stopService
 {
-
+    my ($self) = @_;
+
+    EBox::Service::manage(RUNNERD_SERVICE, 'stop');
 }
 
@@ -267 +272 @@
 }
 
+# Start/stop/restart runnerd daemon
+sub _doDaemon
+{
+    my ($self) = @_;
+
+    if ( $self->eBoxSubscribed() ) {
+        if ( EBox::Service::running(RUNNERD_SERVICE) ) {
+            EBox::Service::manage(RUNNERD_SERVICE, 'restart');
+        } else {
+            EBox::Service::manage(RUNNERD_SERVICE, 'start');
+        }
+    } else {
+        EBox::Service::manage(RUNNERD_SERVICE, 'stop');
+    }
+}
+
 # Return the allowed prefix to send jobs
 sub _allowedPrefix

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

@@ -7 +7 @@
 use Linux::Inotify2;
 use POSIX qw(SIG_IGN SIGHUP);
+use Pod::Usage;
 
 use constant JOBS_DIR      => EBox::Config::conf() . 'remoteservices/jobs/';
@@ -122 +123 @@
 
 # Get arguments
-my ($foreground) = (0);
-my $result = GetOptions( 'foreground' => \$foreground );
+my ($usage, $foreground) = (0, 0);
+my $correct = GetOptions(
+    'foreground' => \$foreground,
+    'usage|help' => \$usage
+   );
+
+if ( $usage or (not $correct)) {
+    pod2usage(1);
+}
 
 EBox::init();
@@ -158 +166 @@
 
 1;
+
+__END__
+
+=head1 NAME
+
+ebox-runnerd - Daemon intended to run scripts which is placed under a
+               fixed directory which is watched by the daemon
+
+=head1 SYNOPSIS
+
+ebox-runnerd [--usage|help] [--foreground]
+
+ Options:
+    --foreground  Flag to indicate if daemon must be launched in foreground
+                  Default value: false
+    --usage|help  Print this help and exit
+
+=cut