Changeset 11232

Timestamp:

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

Author:

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

Message:

Fixing jobReceiver to work with new communication convention refs #1103

Location:

branches/remote-services/ebox/src

Files:

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

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

@@ -95 +95 @@
     }
 
-    my $jobDirPath = INCOMING_DIR . "$jobId/";
+    my $jobDirPath = JOBS_DIR . "$jobId/";
     my $retValue = 0;
     if ( -d $jobDirPath ) {
@@ -106 +106 @@
     chmod(0700, "$jobDirPath/script");
     File::Slurp::write_file( "$jobDirPath/args", $arguments);
+    # Create the symlink to incoming directory to make it notify to
+    # the ebox-runnerd
+    symlink( $jobDirPath, INCOMING_DIR . $jobId);
 
     return $class->_soapResult($retValue);

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

@@ -47 +47 @@
                   script => qq{#!/bin/bash\necho "\$@"},
                   arguments => $args);
-my $jobDirPath = EBox::Config::conf() . "remote-services/jobs/incoming/$jobId/";
+my $jobDirPath = EBox::Config::conf() . "remote-services/jobs/$jobId/";
 my $cmd = new Test::Cmd(
     prog => "${jobDirPath}script",
@@ -74 +74 @@
 _testCmd($cmd, $jobDirPath, $args);
 
-system("rm -rf $jobDirPath");
+#system("rm -rf $jobDirPath");

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

@@ -80 +80 @@
     close($returnedFile);
     unless ( -d OUTCOMING_DIR . $jobId ) {
-        symlink( $jobDir, OUTCOMING_DIR . $jobId);
+        my $realJobDir = JOBS_DIR . $jobId;
+        symlink( $realJobDir, OUTCOMING_DIR . $jobId);
     }
     unlink($jobDir);