Changeset 11550 for trunk

Timestamp:

11/03/08 09:13:07 (2 months ago)

Author:

javier.amor.garcia@…

Message:

better control of runnign status when ther are not any daemon enabled

Files:

• trunk/client/openvpn/src/EBox/OpenVPN.pm (modified) (2 diffs)

trunk/client/openvpn/src/EBox/OpenVPN.pm

@@ -916 +916 @@
         return 1;
     }elsif ($self->service) {
-        my @activeUserDaemons =
-          grep { (not $_->service) and (not $_->internal) } $self->daemons;
-        return @activeUserDaemons == 0 ? 1 : 0;
+        my @activeDaemons = grep { (not $_->service)  } $self->daemons;
+        return (@activeDaemons == 0) ? 1 : 0;
     }
 
@@ -927 +926 @@
 {
     my ($self) = @_;
-    my @userDaemons = grep { not $_->internal } $self->daemons;
-
-    foreach my $userDaemon (@userDaemons) {
-        return 1 if $userDaemon->running;
-    }
-
-    return
-      0;   # XXX control that there isn't any user daemon incorrectly running
+
+
+    my $noneDaemonEnabled = 1;
+    
+    my @daemons =  $self->daemons;
+    foreach my $daemon (@daemons) {
+        next if $daemon->internal();
+
+        return 1 if $daemon->running;
+        
+        if ($daemon->service()) {
+            $noneDaemonEnabled = 0;
+        }
+    }
+
+
+    if ($noneDaemonEnabled) {
+        return 1 if $self->service()
+    }
+
+    return 0;   # XXX control that there isn't any user daemon incorrectly running
 }