Changeset 11233

Timestamp:

08/18/08 15:24:48 (5 months ago)

Author:

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

Message:

Added watcher when the incoming directory is deleted refs #1103

Location:

branches/remote-services/ebox/src

Files:

• EBox/RemoteServices/Server/t/jobReceiver.t (modified) (2 diffs)
• libexec/ebox-runnerd (modified) (2 diffs)

branches/remote-services/ebox/src/EBox/RemoteServices/Server/t/jobReceiver.t

@@ -42 +42 @@
 }
 
-my $jobId = 1;
+my $jobId = 12321;
 my $args  = 'test1';
 my @coolParams = (jobId => $jobId,
@@ -74 +74 @@
 _testCmd($cmd, $jobDirPath, $args);
 
-#system("rm -rf $jobDirPath");
+system("rm -rf $jobDirPath");

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

@@ -120 +120 @@
 
 $inotify->watch(INCOMING_DIR, IN_CREATE, $incomingSub);
+$inotify->watch(INCOMING_DIR, IN_DELETE_SELF, sub {});
 # Run those directories which have not run previously
 _runRemainder();
@@ -128 +129 @@
         last;
     }
-    $_->{w}{cb} foreach(@events);
+    foreach my $evt (@events) {
+        if ( $evt->IN_DELETE_SELF ) {
+            EBox::warn(INCOMING_DIR . " has been deleted! Stopping daemon...");
+            exit(0);
+        }
+        $evt->{w}{cb};
+    }
 }