feat: improve error handling when running wkhtmltopdf

JarvusInnovations · Nov 28, 2018 · d21402f · d21402f
1 parent aa92bc4
commit d21402f
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/php-classes/RequestHandler.class.php b/php-classes/RequestHandler.class.php
@@ -166,22 +166,25 @@ public static function respondPrint($responseID, $responseData = array(), $forma
             $tmpPath = tempnam('/tmp', 'e_pdf_');
 
             file_put_contents($tmpPath.'.html', $html);
-
-            header('Content-Type: application/pdf');
-            header('Content-Disposition: attachment; filename="'.str_replace('"', '', $responseID).'.pdf"');
-
-            exec(implode(' ', [
+
+            $command = implode(' ', [
                 static::$wkhtmltopdfPath,
                 static::$wkhtmltopdfArguments,
                 escapeshellarg($tmpPath.'.html'),
                 escapeshellarg($tmpPath.'.pdf')
-            ]));
-
+            ]);
+
+            $output = exec($command);
+
             if (!file_exists("$tmpPath.pdf")) {
                 header('HTTP/1.0 501 Not Implemented');
-                die('Unable to generate PDF, check that this system has wkhtmltopdf installed');
+                header('Content-Type: text/plain');
+                die("Unable to generate PDF, see command/output below and check that this system has wkhtmltopdf installed.\n\ncommand: {$command}\n\noutput: {$output}");
             }
-
+
+            header('Content-Type: application/pdf');
+            header('Content-Disposition: attachment; filename="'.str_replace('"', '', $responseID).'.pdf"');
+
             readfile($tmpPath.'.pdf');
             exit();
         } elseif ($format == 'html') {