Merge pull request #3203 from ProcessMaker/bugfix/3167

Truncate docker output log and display more info

Author: velkymx

ProcessMaker/Models/ScriptDockerBindingFilesTrait.php

@@ -86,7 +86,11 @@ private function runContainer($image, $command, $parameters, $bindings, $timeout
                 );
             }
             Log::error('Script threw return code ' . $returnCode . 'Message: ' . implode("\n", $output));
-            throw new ScriptException(implode("\n", $output));
+            
+            $message = implode("\n", $output);
+            $message .= "\n\nProcessMaker Stack:\n";
+            $message .= (new \Exception)->getTraceAsString();
+            throw new ScriptException($message);
         }
         $outputs = $this->getOutputFilesContent();
         $this->removeTemporalFiles();

ProcessMaker/Models/ScriptDockerCopyingFilesTrait.php

@@ -5,6 +5,7 @@
 use Log;
 use RuntimeException;
 use ProcessMaker\Exception\ScriptTimeoutException;
+use ProcessMaker\Exception\ScriptException;
 
 /**
  * Execute a docker container copying files to interchange information.
@@ -51,7 +52,7 @@ private function createContainer($image, $command, $parameters = '')
     {
         $cidfile = tempnam(config('app.processmaker_scripts_home'), 'cid');
         unlink($cidfile);
-        $cmd = config('app.processmaker_scripts_docker') . sprintf(' create %s --cidfile %s %s %s 2>&1', $parameters, $cidfile, $image, $command);
+        $cmd = config('app.processmaker_scripts_docker') . sprintf(' create --network=host %s --cidfile %s %s %s 2>&1', $parameters, $cidfile, $image, $command);
         $line = exec($cmd, $output, $returnCode);
         if ($returnCode) {
             throw new RuntimeException('Unable to create a docker container: ' . implode("\n", $output));
@@ -150,7 +151,10 @@ private function startContainer($container, $timeout)
                 throw new ScriptTimeoutException(implode("\n", $output));
             }
             Log::error('Script threw return code ' . $returnCode);
-            throw new ScriptException(implode("\n", $output));
+            $message = implode("\n", $output);
+            $message .= "\n\nProcessMaker Stack:\n";
+            $message .= (new \Exception)->getTraceAsString();
+            throw new ScriptException($message);
         }
         return compact('line', 'output', 'returnCode');
     }

ProcessMaker/ScriptRunners/Base.php

@@ -115,7 +115,7 @@ public function run($code, array $data, array $config, $timeout, ?User $user)
         $returnCode = $response['returnCode'];
         $stdOutput = $response['output'];
         $output = $response['outputs']['response'];
-        \Log::debug("Docker returned: " . json_encode($response));
+        \Log::debug("Docker returned: " . substr(json_encode($response), 0, 500));
         if ($returnCode || $stdOutput) {
             // Has an error code
             throw new RuntimeException(implode("\n", $stdOutput));

tests/bootstrap.php

@@ -94,10 +94,10 @@
     Artisan::call('migrate:fresh', []);
 }
 
-if (count(ScriptExecutor::listOfExecutorImages('php')) === 0) {
+if (ScriptExecutor::where('language', 'php')->count() === 0) {
     Artisan::call('docker-executor-php:install');
 }
 
-if (count(ScriptExecutor::listOfExecutorImages('lua')) === 0) {
+if (ScriptExecutor::where('language', 'lua')->count() === 0) {
     Artisan::call('docker-executor-lua:install');
 }