finally use of uploaded files

VitexSoftware · Dec 25, 2024 · caf3925 · caf3925
1 parent 8d55dc5
commit caf3925
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/MultiFlexi/Executor/Native.php b/src/MultiFlexi/Executor/Native.php
@@ -26,7 +26,8 @@ class Native extends \MultiFlexi\CommonExecutor implements \MultiFlexi\executor
 {
     public $timeout = 32767;
     private \Symfony\Component\Process\Process $process;
-    private $commandline;
+    private string $commandline;
+    private array $jobFiles = [];
 
     public static function name(): string
     {
@@ -38,6 +39,13 @@ public static function description(): string
         return _('Run Job on same machine as MultiFlexi itself');
     }
 
+    public function setJob(\MultiFlexi\Job &$job): void {
+        parent::setJob($job);
+        $this->jobFiles = (new \MultiFlexi\FileStore())->extractFilesForJob($this->job);
+
+        $this->environment = array_merge($this->environment, $this->jobFiles);
+    }
+
     /**
      * @return string
      */
@@ -56,15 +64,12 @@ public function cmdparams()
 
     public function commandline(): string
     {
+        $this->job->setEnvironment($this->environment);
         return $this->executable().' '.$this->cmdparams();
     }
 
     public function launch($command)
     {
-        $jobFiles = (new \MultiFlexi\FileStore())->extractFilesForJob($this->job);
-
-        $this->environment = array_merge($this->environment, $jobFiles);
-
         $this->process = new \Symfony\Component\Process\Process(explode(' ', $command), null, \MultiFlexi\Environmentor::flatEnv($this->environment), null, $this->timeout);
 
         try {
@@ -93,7 +98,7 @@ public function launch($command)
 
         $this->addStatusMessage('pid:'.(isset($this->pid) ? (string) ($this->pid) : 'n/a').' '.$command.': '.$this->process->getExitCodeText(), $this->process->getExitCode() === 0 ? 'success' : 'warning');
 
-        foreach ($jobFiles as $field => $file) {
+        foreach ($this->jobFiles as $field => $file) {
             unlink($file['value']);
         }
 

diff --git a/src/MultiFlexi/Job.php b/src/MultiFlexi/Job.php
@@ -763,4 +763,8 @@ public function setPid(int $pid): void
         $this->setDataValue('pid', $pid);
         $this->setZabbixValue('pid', $pid);
     }
+
+    public function setEnvironment(array $environment) {
+        $this->environment = $environment;
+    }
 }